From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DAEAC433EF for ; Sun, 26 Sep 2021 01:46:25 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B8946108B for ; Sun, 26 Sep 2021 01:46:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9B8946108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95712835F8; Sun, 26 Sep 2021 03:45:26 +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="h+hFy/Sf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3596C835D6; Sun, 26 Sep 2021 03:44:32 +0200 (CEST) Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) (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 42D43835BC for ; Sun, 26 Sep 2021 03:44:00 +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-oi1-x22f.google.com with SMTP id a3so20302920oid.6 for ; Sat, 25 Sep 2021 18:44:00 -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=o+vrDeCQx8Ykv3iYMKqhBDP0HkRSgyOmqvrHOkjbxq8=; b=h+hFy/SfLg52G7AIWQHq38YZDsuOJG1jpvISD6F/TK5KIS8Dn/I11jtR4WX4siSt8t pC1G2J49anGF4Fzqg+1czbCm/ua+adnJ9LfXZFtTKm9Q6EOPb+Q8o/ayGXJ8BCVG/IP1 kzSbQAsFBFqktf3a3wjLipMhG/u7bE5akNeqM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o+vrDeCQx8Ykv3iYMKqhBDP0HkRSgyOmqvrHOkjbxq8=; b=GWXCsl2AzK/9fggXdMq5xyXMmz2UGhmD6Sk7IoBv7U1nHhgjmKT+bYjnvNBv6G9W1S MfkHiVGoYjtn5wQWB2wNRCAksZ3J9nzmXOmHC4WaKraKz2w09WpRBCissfhWstmPJQpZ 3KEYp5TxgYwhvxHnWYzwLiPcGlqGTQ50xLbS92VKzg55mUqsQPgZpSBPctjxM2xxaH9k prz3MHvtWSFZn5TWJ3+vvTeaJSCbpM1BuJN4L1ZKA5knHCIvvOGmKLyNgONFXRcAl5hP 1Aen5t1ooA2XezpE69apjCjcRBSe3ISAKMUqnb5E7kJmaNz9ps9Hzq/y2xjNTyaMoFs3 rRvA== X-Gm-Message-State: AOAM533gQo56Ip3iVmJem/nIbbT+Tm35Dw89TDWbVMCEtgJO8ktCGmQE P1bdzDpZ1Y1/kClBINSJ0Vk+dWmJG8LFkQ== X-Google-Smtp-Source: ABdhPJzD2eFhGURdluaWMsJ1l20l0TKAmSiLMSo7Tjh/F1WZVYA5mj48Ys/W5A6GocC/42Y2hwu/Xg== X-Received: by 2002:a05:6808:690:: with SMTP id k16mr7166404oig.152.1632620638713; Sat, 25 Sep 2021 18:43:58 -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 c18sm330378otr.72.2021.09.25.18.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 18:43:58 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alexandru Gagniuc , Andre Przywara , Rasmus Villemoes , Robert Marko , Masahiro Yamada , Tom Rini , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v5 09/29] image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host Date: Sat, 25 Sep 2021 19:43:22 -0600 Message-Id: <20210925194327.v5.9.I0481c8d9b6f4bd7e467d0324c81295dd0a9bbc96@changeid> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210926014342.127913-1-sjg@chromium.org> References: <20210926014342.127913-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 --- Changes in v5: - Use TOOLS_ instead of HOST_ include/image.h | 5 ++--- tools/Kconfig | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/image.h b/include/image.h index f09eb9de516..6efbef06e64 100644 --- a/include/image.h +++ b/include/image.h @@ -28,7 +28,6 @@ struct fdt_region; #include /* new uImage format support enabled on host */ -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_RSASSA_PSS 1 #define IMAGE_ENABLE_IGNORE 0 @@ -1458,7 +1457,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)) @@ -1470,7 +1469,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 747d221803f..9d1c0efd40c 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -45,6 +45,11 @@ config TOOLS_FIT_SIGNATURE_MAX_SIZE depends on TOOLS_FIT_SIGNATURE default 0x10000000 +config TOOLS_FIT_VERBOSE + def_bool y + help + Support verbose FIT output in the tools builds + config TOOLS_MD5 def_bool y help -- 2.33.0.685.g46640cef36-goog