Message ID | 20210506082420.v2.24.I0481c8d9b6f4bd7e467d0324c81295dd0a9bbc96@changeid |
---|---|
State | Deferred |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=hhi7QYOg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fbbds1L0Jz9sW7 for <incoming@patchwork.ozlabs.org>; Fri, 7 May 2021 00:32:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA59A82E32; Thu, 6 May 2021 16:32:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="hhi7QYOg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD7C582E1A; Thu, 6 May 2021 16:32:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D2F2A82D57 for <u-boot@lists.denx.de>; Thu, 6 May 2021 16:25:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x332.google.com with SMTP id b5-20020a9d5d050000b02902a5883b0f4bso5030488oti.2 for <u-boot@lists.denx.de>; Thu, 06 May 2021 07:25:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S8l3IHvEj6GcDlnERhZPDN7Q/EjPM09abs1n1CftEP8=; b=hhi7QYOg/NA1tKhx5ehmM533b56109IKW8V8N1XRncZPvKt56kUp/GI6bGHiDSbGix EM02pbV4dDAiOVbEjl2rKkMtUuqpfdbU1NLDTrkSuAwfnANi/UldxX2hgS1E8yVObgYs W9qlhLfj4PdqkBZm7iZalV2r8WjGBYO+lmwSE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S8l3IHvEj6GcDlnERhZPDN7Q/EjPM09abs1n1CftEP8=; b=c8urv3cHC8O9+71bcpeXoKyrTM7sJi4qGf8559iCrl3TkdiqnZiJ4HRqbobmEacdVQ gsCe5XgddA/x/1jm1inTqStKZoYmlcsyvI93NjNIUjoX4xbbq3ttC8HM/4CUTMmeu3jI GXIJWuVtoQ4ekIN/Ss+arMQn67+MqwNxUoegRhIhk46YYAJVxF5x4RKPIXxZe5bD1myK L13xIMenx/41NSlT828ZUZPr8UcWtHUcm/7bCStmcYeBQ5WGDroXccD57PuSkLYy8WD9 /adtoTIMnrts5sNCOW24Ov3J5vjZmVy2vditdE/oJukRnD1n8NDtR+evxh0eKKvDH8Hv H7Bw== X-Gm-Message-State: AOAM5320PffPAY/cPCJJaC4pCAeCOXzG2qv6TcdGL/KIqbxl6uqFdtFL SVWy8/m37hv2wmmMI0VMT+3eJE9eBbEdTJzs X-Google-Smtp-Source: ABdhPJxIs9QtOG6RWXJ0LmA9xC/VA81AfaQEK3/emgHDZa5GdwoM2GtYDDyggacIFAyy+SPl+WBCgA== X-Received: by 2002:a9d:761a:: with SMTP id k26mr3723239otl.193.1620311124361; Thu, 06 May 2021 07:25:24 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id z204sm445490oia.2.2021.05.06.07.25.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 07:25:24 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Andre Przywara <andre.przywara@arm.com>, Masahiro Yamada <masahiroy@kernel.org>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Robert Marko <robert.marko@sartura.hr>, Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com>, Marek Vasut <marex@denx.de> Subject: [PATCH v2 24/50] image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host Date: Thu, 6 May 2021 08:24:12 -0600 Message-Id: <20210506082420.v2.24.I0481c8d9b6f4bd7e467d0324c81295dd0a9bbc96@changeid> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog In-Reply-To: <20210506142438.1310977-1-sjg@chromium.org> References: <20210506142438.1310977-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
image: Reduce #ifdefs and ad-hoc defines in image code
|
expand
|
diff --git a/include/image.h b/include/image.h index bdf19a4cc04..b08ae2bb6c0 100644 --- a/include/image.h +++ b/include/image.h @@ -28,7 +28,6 @@ struct fdt_region; #include <linux/kconfig.h> /* new uImage format support enabled on host */ -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT 1 #define IMAGE_ENABLE_IGNORE 0 @@ -1509,7 +1508,7 @@ int fit_image_cipher_get_algo(const void *fit, int noffset, char **algo); struct cipher_algo *image_get_cipher_algo(const char *full_name); -#ifdef CONFIG_FIT_VERBOSE +#if CONFIG_IS_ENABLED(FIT_VERBOSE) #define fit_unsupported(msg) printf("! %s:%d " \ "FIT images not supported for '%s'\n", \ __FILE__, __LINE__, (msg)) @@ -1521,7 +1520,7 @@ struct cipher_algo *image_get_cipher_algo(const char *full_name); #else #define fit_unsupported(msg) #define fit_unsupported_reset(msg) -#endif /* CONFIG_FIT_VERBOSE */ +#endif /* FIT_VERBOSE */ #endif /* CONFIG_FIT */ #if !defined(USE_HOSTCC) diff --git a/tools/Kconfig b/tools/Kconfig index c67dc04f5ed..6d0f4565a80 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -54,6 +54,11 @@ config HOST_FIT_SIGNATURE_MAX_SIZE depends on HOST_FIT_SIGNATURE default 0x10000000 +config HOST_FIT_VERBOSE + def_bool y + help + Support verbose FIT output in the host build + config HOST_OF_LIBFDT def_bool y help
Add a host Kconfig for FIT_VERBOSE. With this we can use CONFIG_IS_ENABLED(FIT_VERBOSE) directly in the host build, so drop the forcing of this in the image.h header. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) include/image.h | 5 ++--- tools/Kconfig | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-)