From patchwork Fri Aug 20 20:52:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519190 X-Patchwork-Delegate: sbabic@denx.de Return-Path: 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=) 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Grv472T3fz9sW8 for ; Sat, 21 Aug 2021 06:53:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6FCEA82E08; Fri, 20 Aug 2021 22:53:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 2DA3082D50; Fri, 20 Aug 2021 22:52:57 +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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) (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 51C0080F4B for ; Fri, 20 Aug 2021 22:52:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from toolbox.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MmTgj-1mi20n47JB-00iPve; Fri, 20 Aug 2021 22:52:41 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Peng Fan Subject: [PATCH v1 1/7] imx: mkimage_fit_atf: fix legacy image generation Date: Fri, 20 Aug 2021 22:52:24 +0200 Message-Id: <20210820205230.1369683-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Fr1zrP1UGlwwM5W4cCEg211I4OBu5zO37Sxy0Wv5T1dk6Jr1KIQ J1CIM7nshyr5Ju5GbOaWvvv0vcMfXOKuWPl/0oMXsCl4APdpPEDDMaAUhmWhk5BL0aScpge 7izhU5tZc/zD66tqStnVbtoM11BPP3uVuBl3Gzlq/82ce9Zygb26NilAjRWLt0RzmFbj/Xn +RrBHXzgkV/sa1D42smQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:tS+k+Ay3dYw=:4NuDqpt/hQOq5RLtu9xe/N jOkPuYSELvOf7stqyR/IY8fp37b2z5CiORQFMdVmO7dE/FHoIsQLAZdqhuuNwe0p7kWJRlL75 vzgVlWIteF8bAvxUCpFg5dGoHvIOaE5QL1BDtP94+ZUpJtOQzXCnGh4QkY8ikXyjD8om1g/HL 8yj95EQcVQ0bXi3xp8bXTmfm/BzHOB4Gtmv0QbAYMm9+6xCKDVXiZQRmYeON3vmz94wGmZx5f QnL4lCcRvPNWxFIYIWZKWYY5DZed5nZYTSBkxXVRpb+W0Une+F3tx8uu8Q6CEhR/Oiz23poCa Kbe95tUpTroOWeZNxvrd+jUZMdaO7sgr9dYMSsZogLdSnsqQK9+OZidZGVNZuhHFykFXO22yV xp7oXWhdqrNQhQieTRZ8O0HX810r4oacDLaUz5+b8xbRzQCh3sANrqiGOys5nCMRhF8jZBWxd mGa+dpDvvoYJ7Js84yORlVGyZCi5rxtxp32+ogXdfhIDSmfgGZPsOylg8UtxoU+9nmOfMsrAa caVxDjrcbB87M8GEKaJMTbnpECo2GGnb1AQ4aNbfqoAEh1mAnebfqDEJfw6UrtErgrRJNycXx o4dZ+KpErjtPS7iAFI9yO2aidW/TKCRnxnRB5lZCiYKeXx3MAh7NE7e2jgz2GH0NGqS6Wr8aV 2PYeULr4yxdBg5ffqvLSFaDU/oYvNLK5DalWxYDKHKk+oj84+Rl59I160JTLrQ82Vq+2O8vU9 35LF2l45ILP2MQa7fQTYIXbUFWMMpROyGgJXG2zekTYqrWg+we5saNyHXUUkkmXT2XjxsbnVo Qqvk71qaqNzZw+/hqY+3WJBb21hkYmqzR0bRzk7hul6SfukB8kNiFLk/KqKAD7LCjXryCki 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 From: Marcel Ziswiler While most boards meanwhile migrated to using binman a few like the verdin-imx8mm are still using the legacy image generation. Unfortunately, the legacy image generation is currently broken which is especially bad for any kind of bisection attempts. Anyway, this fixes it even though we will also migrate to using binman shortly. Fixes: commit cb9faa6f98ae ("tools: Use a single target-independent config to enable OpenSSL") Signed-off-by: Marcel Ziswiler --- arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh index 2a17968794c..2d6c46633c7 100755 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh @@ -53,7 +53,7 @@ cat << __HEADER_EOF description = "Configuration to load ATF before U-Boot"; images { - uboot@1 { + uboot_1 { description = "U-Boot (64-bit)"; os = "u-boot"; data = /incbin/("$BL33"); @@ -68,7 +68,7 @@ cnt=1 for dtname in $* do cat << __FDT_IMAGE_EOF - fdt@$cnt { + fdt_$cnt { description = "$(basename $dtname .dtb)"; data = /incbin/("$dtname"); type = "flat_dt"; @@ -79,7 +79,7 @@ cnt=$((cnt+1)) done cat << __HEADER_EOF - atf@1 { + atf_1 { description = "ARM Trusted Firmware"; os = "arm-trusted-firmware"; data = /incbin/("$BL31"); @@ -93,7 +93,7 @@ __HEADER_EOF if [ -f $BL32 ]; then cat << __HEADER_EOF - tee@1 { + tee_1 { description = "TEE firmware"; data = /incbin/("$BL32"); type = "firmware"; @@ -108,7 +108,7 @@ fi cat << __CONF_HEADER_EOF }; configurations { - default = "config@1"; + default = "config_1"; __CONF_HEADER_EOF @@ -117,20 +117,20 @@ for dtname in $* do if [ -f $BL32 ]; then cat << __CONF_SECTION_EOF - config@$cnt { + config_$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1", "tee@1"; - fdt = "fdt@$cnt"; + firmware = "uboot_1"; + loadables = "atf_1", "tee_1"; + fdt = "fdt_$cnt"; }; __CONF_SECTION_EOF else cat << __CONF_SECTION1_EOF - config@$cnt { + config_$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1"; - fdt = "fdt@$cnt"; + firmware = "uboot_1"; + loadables = "atf_1"; + fdt = "fdt_$cnt"; }; __CONF_SECTION1_EOF fi