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 X-Spam-Level: X-Spam-Status: No, score=-18.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5872EC4338F for ; Sun, 22 Aug 2021 17:32:58 +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 60EFC61214 for ; Sun, 22 Aug 2021 17:32:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 60EFC61214 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.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 C2797821F0; Sun, 22 Aug 2021 19:32:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="LHq0mdxk"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="EF6X5XEh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3D88681BC0; Sun, 22 Aug 2021 19:32:53 +0200 (CEST) Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 848A1821F0 for ; Sun, 22 Aug 2021 19:32:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 832CA58044C; Sun, 22 Aug 2021 13:32:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Aug 2021 13:32:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= to:cc:references:from:subject:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s=fm3; bh=J Y9EqwNm/d+i004txEUYbj5dp0XlnigVS+V4m35ZMaw=; b=LHq0mdxksS3LN90Er lxqlrEywQw5g7fC55n9FwFEtwGZ/n4snuHSnvFm6goSJaLm8bdyVO6Emj+xSaH9n sUble8gOuW3mzJ7iJyTYDMn+RpL3/xJ8nDptzjm4n9qxDPP7qxIatWhW8mmGvt4h fADfBh+NoXdWU74816hNnnUsxvR4iSLsaUrq+O1c/rIiFKxBZYLRqoLdjWnVWXhA QwdKm54WkU+17YBTsta3F+LWC8CqK6bqEBwSJKEVtzb4KA2oYrOl7vlA6EaYnE0l Cr58JtYf7v3+fQtGx/lsilviN0QstxYLDIiqufkyWL0dzYifnQR5yKBS1nTxSin7 YE5Zg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=JY9EqwNm/d+i004txEUYbj5dp0XlnigVS+V4m35ZM aw=; b=EF6X5XEh8LSfLNyiWrU+iCzVYQVET9lT1saEKqRKY/eipHO6PPduieapC x7zr2pfEzDwv/aaauQ684BMjQ8CST8z2WKse6Ywb1j+khXYy4vusoU4QcCcIPpcZ gdrMUpZq4MFfhszLW0LRlaohXY8wnDQ8d9tzD9dVUINVF2DIe867P0AFOAL+TmMf kDFbadJb0pgR4wcG9CIwjXqv4G3kbGANDY9XKKWyjmUzPWmPdj5nH9JlM7YvuDV7 O6pjZZLFwNpU9+6XQNN9P/ML7dj7cV+Yugcw2PS4BcHxPgBncIn3SBQt/8XWBHvn diIfnJSHXKS3T8Tw83wm3+p286b4w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddruddtfedguddugecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefvfhfhuffkffgfgggjtgfgsehtkeertddtfeejnecuhfhrohhmpefurghm uhgvlhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenuc ggtffrrghtthgvrhhnpedvtddtjeeiuddugfffveetkeffgeffgedutdfgfeekudevudek ffehtdefveeuvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Aug 2021 13:32:41 -0400 (EDT) To: =?UTF-8?Q?Pali_Roh=c3=a1r?= Cc: u-boot@lists.denx.de, Jagan Teki , Andre Przywara , AKASHI Takahiro , Alexandru Gagniuc , Baruch Siach , Bharat Gooty , Chris Packham , Fabio Estevam , Frieder Schrempf , Jernej Skrabec , =?UTF-8?Q?Marek_Beh=c3=ban?= , "NXP i.MX U-Boot Team" , Naoki Hayama , Patrick Delaunay , Priyanka Jain , Rayagonda Kokatanur , Simon Glass , Stefan Roese , Stefano Babic , Sughosh Ganu , Trevor Woerner , lauri.hintsala@silabs.com References: <20210822044649.13585-1-samuel@sholland.org> <20210822044649.13585-2-samuel@sholland.org> <20210822095853.2tcpzfqjcmh5w3xm@pali> From: Samuel Holland Subject: Re: [PATCH v2 1/4] tools: Separate image types which depend on OpenSSL Message-ID: Date: Sun, 22 Aug 2021 12:32:40 -0500 User-Agent: Mozilla/5.0 (X11; Linux ppc64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210822095853.2tcpzfqjcmh5w3xm@pali> Content-Type: text/plain; charset=utf-8 Content-Language: en-US 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 On 8/22/21 4:58 AM, Pali Rohár wrote: > Hello! > > On Saturday 21 August 2021 23:46:45 Samuel Holland wrote: >> Some image types always depend on OpenSSL, so they can only be included >> in mkimage when TOOLS_LIBCRYPTO is selected. Instead of using arbitrary >> preprocessor definitions, conditionally link the files. >> >> When building for platforms which use those image types, automatically >> select TOOLS_LIBCRYPTO, it is required for the build to complete. >> >> Signed-off-by: Samuel Holland >> --- >> >> Changes in v2: >> - Refactored the first patch on top of TOOLS_LIBCRYPTO >> >> arch/arm/mach-imx/mxs/Kconfig | 2 ++ >> arch/arm/mach-mvebu/Kconfig | 1 + >> scripts/config_whitelist.txt | 1 - >> tools/Makefile | 19 +++++-------------- >> tools/mxsimage.c | 3 --- >> 5 files changed, 8 insertions(+), 18 deletions(-) >> >> diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig >> index 9f48ffda414..24d452942a5 100644 >> --- a/arch/arm/mach-imx/mxs/Kconfig >> +++ b/arch/arm/mach-imx/mxs/Kconfig >> @@ -3,6 +3,7 @@ if ARCH_MX23 >> config MX23 >> bool >> default y >> + select TOOLS_LIBCRYPTO >> >> choice >> prompt "MX23 board select" >> @@ -34,6 +35,7 @@ if ARCH_MX28 >> config MX28 >> bool >> default y >> + select TOOLS_LIBCRYPTO >> >> choice >> prompt "MX28 board select" >> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig >> index 89737a37ad9..c02521c71bc 100644 >> --- a/arch/arm/mach-mvebu/Kconfig >> +++ b/arch/arm/mach-mvebu/Kconfig >> @@ -29,6 +29,7 @@ config ARMADA_38X >> bool >> select ARMADA_32BIT >> select HAVE_MVEBU_EFUSE >> + select TOOLS_LIBCRYPTO > > kwbimage format is used also by A375 and AXP platform. So rather put > this select into ARMADA_32BIT section. I can do this. > Moreover kwbimage format is used also by orion and kirkwood platforms. > So this dependency needs to be enabled on more places. Since you know where they should go, would you be willing to send a patch adding the additional "select"s? Side note: TOOLS_LIBCRYPTO=y is the default, so nobody seems to have noticed, but actually the build with TOOLS_LIBCRYPTO=n is broken since commit b4f3cc2c42d9 ("tools: kwbimage: Do not hide usage of secure header under CONFIG_ARMADA_38X"). So I will add a Fixes: tag in v3. Regards, Samuel >> config ARMADA_38X_HS_IMPEDANCE_THRESH >> hex "Armada 38x USB 2.0 High-Speed Impedance Threshold (0x0 - 0x7)" >> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt >> index 2d70bf5da7c..5caaad0c3dc 100644 >> --- a/scripts/config_whitelist.txt >> +++ b/scripts/config_whitelist.txt >> @@ -1000,7 +1000,6 @@ CONFIG_MXC_UART_BASE >> CONFIG_MXC_USB_FLAGS >> CONFIG_MXC_USB_PORT >> CONFIG_MXC_USB_PORTSC >> -CONFIG_MXS >> CONFIG_MXS_AUART >> CONFIG_MXS_AUART_BASE >> CONFIG_MXS_OCOTP >> diff --git a/tools/Makefile b/tools/Makefile >> index 4a86321f646..ad0e9cf9490 100644 >> --- a/tools/Makefile >> +++ b/tools/Makefile >> @@ -94,9 +94,11 @@ ECDSA_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix lib/ecdsa/, ecdsa-libcrypto. >> AES_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix lib/aes/, \ >> aes-encrypt.o aes-decrypt.o) >> >> -# Cryptographic helpers that depend on openssl/libcrypto >> -LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix lib/, \ >> - fdt-libcrypto.o) >> +# Cryptographic helpers and image types that depend on openssl/libcrypto >> +LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := \ >> + lib/fdt-libcrypto.o \ >> + kwbimage.o \ >> + mxsimage.o >> >> ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o >> >> @@ -117,10 +119,8 @@ dumpimage-mkimage-objs := aisimage.o \ >> imximage.o \ >> imx8image.o \ >> imx8mimage.o \ >> - kwbimage.o \ >> lib/md5.o \ >> lpc32xximage.o \ >> - mxsimage.o \ >> omapimage.o \ >> os_support.o \ >> pblimage.o \ >> @@ -155,22 +155,13 @@ fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o >> fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o >> file2include-objs := file2include.o >> >> -ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_TOOLS_LIBCRYPTO),) >> -# Add CONFIG_MXS into host CFLAGS, so we can check whether or not register >> -# the mxsimage support within tools/mxsimage.c . >> -HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS >> -endif >> - >> ifdef CONFIG_TOOLS_LIBCRYPTO >> # This affects include/image.h, but including the board config file >> # is tricky, so manually define this options here. >> HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE >> HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE_MAX_SIZE=0xffffffff >> HOST_EXTRACFLAGS += -DCONFIG_FIT_CIPHER >> -endif >> >> -# MXSImage needs LibSSL >> -ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),) >> HOSTCFLAGS_kwbimage.o += \ >> $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") >> HOSTLDLIBS_mkimage += \ >> diff --git a/tools/mxsimage.c b/tools/mxsimage.c >> index 002f4b525aa..2bfbb421eb6 100644 >> --- a/tools/mxsimage.c >> +++ b/tools/mxsimage.c >> @@ -5,8 +5,6 @@ >> * Copyright (C) 2012-2013 Marek Vasut >> */ >> >> -#ifdef CONFIG_MXS >> - >> #include >> #include >> #include >> @@ -2363,4 +2361,3 @@ U_BOOT_IMAGE_TYPE( >> NULL, >> mxsimage_generate >> ); >> -#endif >> -- >> 2.31.1 >>