From patchwork Thu Aug 26 12:14:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1521072 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GwMH0496kz9sXM for ; Thu, 26 Aug 2021 22:14:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 88D1C8311F; Thu, 26 Aug 2021 14:14:34 +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 6870982F2B; Thu, 26 Aug 2021 14:14:31 +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_H2, 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.196]) (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 E98A380F30 for ; Thu, 26 Aug 2021 14:14:26 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MDiSu-1mFRBf1R7e-00H6sR; Thu, 26 Aug 2021 14:14:17 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Tim Harvey , Simon Glass , Frieder Schrempf , Stefano Babic , Marcel Ziswiler , Kirill Kapranov , Peng Fan , Valentin Raevsky , "Ying-Chun Liu (PaulLiu)" Subject: [RFC PATCH v1 1/5] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Date: Thu, 26 Aug 2021 14:14:05 +0200 Message-Id: <20210826121409.220124-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210826121409.220124-1-marcel@ziswiler.com> References: <20210826121409.220124-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:RytxtlkOcf2VF7QzJQ51vNjllrJBvPHTCkNZgN6REksml+dQlri GShiqptCKM8qG/kRtgXjpICtCbSTrQ5Lr3UEgQHyjWkau6rqHiGyAunC3LEB9ckZQc9VsNj 7HcmolFpfYYYqeoN4gysmcDxF7GtULGLj4qsBkBiH7SJS2Eu1V8jgiP6jW7INzmFCorpfkp hRZ1H6TISfmRgulQOUHZQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:8WZQI/Wzsg4=:w/mzbe2vyllgyNDFwcoopM 5/oC4+w/iVkRniujnzTvSaxtfH+2ngPqa6d/lO7iUin1pU+yAQcj+x9WWxx5UtpoylvtPZp21 IwyTH5kOgDvS8AbENyzp1X5sWhxmV4AG02v/6rUpkOOKO491UGAmPNYa9LRNgXOSmS1ezsOfA 1/+S/GCXxzRwV41/FYY1jGPlqWbu91B3q2Zx223Lx4jYxS1sJ2MOSEBhk2crnkk/p/8h1y0ZA xbpbJrJyGwR2KvwrqFPj0YCEmKWjrF8TG/bcp0poTmSZL5ch0WLLr/uzWCCezhXYCgfE94wxt MLKPQFceLeckIYmq0MmSLFBXX2Qp4oe7gcstLu/b7ClOxSx/oz6AteQdjN1RIeaw7YKSu7Zr/ wHND60nv56ocVGtmBHfkiG+kZdO+If5KUNEFMdQSAhVPjQqEs6RIA9E4iT1gHnd/1SKUJSnzA uNaWgfBHQ/xoHUDJmJtEk5Cv1wDHPb6wE4GgWEeQOO/h6YZezkJ9jAKLvX6rcJJUlZ/A+RNIT kaoGCj9o+udbe+XC/hOlGmrfYYV/t0Rjr2lndjjJPi1nXBtRbm7msHMYiidExyx0wcVpcwTuC Pd531QbPRpAznXjKoeNC397yo06EuSNf3ZV7QNvHFKI0gMragKe7JXWq4lZUp3KFqxjv4gXM1 BhAfn95J68S+r4xwcgvW8gK9NW793DDDlzkPYcHf6vhuIFZ1LpCK++8zcngbh6+wofpX406uo EiXNLP18w4kd9MrQUxTSrQtX1LZ2cRY3WkRZtA== 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 This fixes the following build time issue: ... BINMAN all binman: Error 1 running 'mkimage -d ./mkimage.spl.mkimage -n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000 ./mkimage-out.spl.mkimage': mkimage.flash.mkimage: Can't open: No such file or directory make: *** [Makefile:1094: all] Error 1 Signed-off-by: Marcel Ziswiler --- board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg b/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg index b89092a5590..4071219fbf4 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg +++ b/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg @@ -6,4 +6,4 @@ #define __ASSEMBLY__ BOOT_FROM sd -LOADER mkimage.flash.mkimage 0x7E1000 +LOADER u-boot-spl-ddr.bin 0x7e1000 From patchwork Thu Aug 26 12:14:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1521077 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4GwMJ65DcGz9svs for ; Thu, 26 Aug 2021 22:15:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0D6D982F4C; Thu, 26 Aug 2021 14:15:47 +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 73DC282EA5; Thu, 26 Aug 2021 14:14:51 +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_H2, SPF_HELO_PASS,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) (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 3A39A82EB9 for ; Thu, 26 Aug 2021 14:14:29 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MPnHA-1mN69R16jS-004yJf; Thu, 26 Aug 2021 14:14:19 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Tim Harvey , Simon Glass , Frieder Schrempf , Stefano Babic , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Tom Rini Subject: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi Date: Thu, 26 Aug 2021 14:14:06 +0200 Message-Id: <20210826121409.220124-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210826121409.220124-1-marcel@ziswiler.com> References: <20210826121409.220124-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:yYhoUODX2RC2ZWIuf+tvvuaJ9+Sb42eUrGZPCqkFDLFVzXoFzZs tg/+wugKkq8Y4zzzdP9eI8049DTMFgaGuWwwXDGq4mQ/lb3auEEmT7TY3evhF2gCy/EpvGX 1Q+nAPP+Nl/vBZflFO9FuBLabaLXjJhGuLtktSbeVcdstvCNESCI/Hwig2tYrl+0KjSu4HP lpYZ+9gBW8H1DuvaRrr7A== X-UI-Out-Filterresults: notjunk:1;V03:K0:RCF0x/axAiQ=:e88ymSvUtwGUMzUufJ49Ia ayzGHf/jFNzh94ZoTacwndpHYvaxRY6gyOXx9eqC0AlwZSLQ6UwGEVL4t5FOQmKk/QggFcYG5 Oss//KiKwsTr7Yk9vGr6kV9h1q96MJmXFiB0+nGT+lxdLZVkgfqDyfGICp2gAGxrRPuuQuLOu yZ8qwxdN1+DxZLxT27Rn19PmT3Ruwi7qvg49QpSRX2lE/RX1m6aAFwmTKaXv0w7uIOLtsNPzA 8e3DEtaCmQE0bS43B7i7VCj2j1fChzrrbG20SupyEc2J2nmi+h+CE/adkGEruQDO6MJVsyQ+b s/aTB69yvELTWO+0tQhLnL9CmT7bC+gR66Yrhn6XKAkuBkbe2Y1tS2gXVVBOz43NT4Pe5QY/m onqszOu7vyth1OOHWO29XjXwdt6NsRXMP22ErBcg6x/6WLPcyjiKtC8afY7EaLAsgBpcsBW3b y2rJsz7QuRWz42fGQ+clv38vaV2lwfsutK9FGya+iW1YsRbrT2gMlMGUO5zXQLeCfTD90sfnq jzz9eiy/OVBZxl/V7i70tKElIgJhXAdSzR+4Rhzi1yl7MB9y4I0lb0JjzkdlyyLz/BGaFeAoK u490fEt1p60cJeNmeTlpbqs9YlNDLS9+pyMCwkHMz9fRzLyNVebt4DxNIvRN7vfqI3lZhtpOV +X4h4J9dZXlVnNM2++jp2kp6QYlHJAAjY3CSeJBlidseq+0aJNQwn8PyQHrDcY7j3ydlWd7fY y6mFodBHImylG2cdTMIP69/+s3tcDF/09hcbZQ== 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 With the move to using binman to generate SPL aka u-boot-spl-ddr.bin and U-Boot proper aka u-boot.itb every board now covers such configuration in its own U-Boot specific device tree include. Introduce a new common imx8mm-binman.dtsi which covers the common part of that configuration. Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx8mm-binman.dtsi | 136 ++++++++++++++++++ arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 126 ++-------------- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 124 +--------------- .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 123 +--------------- arch/arm/dts/imx8mm-venice-u-boot.dtsi | 120 +--------------- arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 123 +--------------- 6 files changed, 156 insertions(+), 596 deletions(-) create mode 100644 arch/arm/dts/imx8mm-binman.dtsi diff --git a/arch/arm/dts/imx8mm-binman.dtsi b/arch/arm/dts/imx8mm-binman.dtsi new file mode 100644 index 00000000000..2d98c1ef577 --- /dev/null +++ b/arch/arm/dts/imx8mm-binman.dtsi @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 Toradex + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-spl-ddr { + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + u-boot-spl { + align-end = <4>; + }; + + blob_1: blob-ext@1 { + filename = "lpddr4_pmu_train_1d_imem.bin"; + size = <0x8000>; + }; + + blob_2: blob-ext@2 { + filename = "lpddr4_pmu_train_1d_dmem.bin"; + size = <0x4000>; + }; + + blob_3: blob-ext@3 { + filename = "lpddr4_pmu_train_2d_imem.bin"; + size = <0x8000>; + }; + + blob_4: blob-ext@4 { + filename = "lpddr4_pmu_train_2d_dmem.bin"; + size = <0x4000>; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,external-offset = ; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = ; + + uboot_blob: blob-ext { + filename = "u-boot-nodtb.bin"; + }; + }; + + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <0x920000>; + entry = <0x920000>; + + atf_blob: blob-ext { + filename = "bl31.bin"; + }; + }; + + binman_fip: fip { + description = "Trusted Firmware FIP"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <0x40310000>; + }; + + fdt { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + default = "conf"; + + binman_configuration: conf { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl: blob-ext@1 { + offset = <0x0>; + filename = "spl.bin"; + }; + + binman_uboot: blob-ext@2 { + offset = <0x57c00>; + filename = "u-boot.itb"; + }; + }; +}; diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi index 3226a244a97..7235763c561 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi @@ -3,11 +3,9 @@ * Copyright 2019 NXP */ -/ { - binman: binman { - multiple-images; - }; +#include "imx8mm-binman.dtsi" +/ { wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -141,115 +139,19 @@ u-boot,dm-spl; }; -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - - u-boot-spl { - align-end = <4>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; - }; +&binman_fip { + description = "Trusted Firmware FIP"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <0x40310000>; - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; - }; - }; - - flash { - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; + fip_blob { + filename = "fip.bin"; + type = "blob-ext"; }; +}; - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x920000>; - entry = <0x920000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - fip { - description = "Trusted Firmware FIP"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x40310000>; - - fip_blob: blob-ext{ - filename = "fip.bin"; - }; - }; - - fdt { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - default = "conf"; - - conf { - description = "NAME"; - firmware = "uboot"; - loadables = "atf", "fip"; - fdt = "fdt"; - }; - }; - }; - }; +&binman_configuration { + loadables = "atf", "fip"; }; diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index 3c75415e8fb..6b0d70aa9de 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -3,13 +3,10 @@ * Copyright 2019 NXP */ +#include "imx8mm-binman.dtsi" #include "imx8mm-u-boot.dtsi" / { - binman: binman { - multiple-images; - }; - wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -116,122 +113,3 @@ &wdog1 { u-boot,dm-spl; }; - -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - - u-boot-spl { - align-end = <4>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; - }; - - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; - }; - }; - - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x920000>; - entry = <0x920000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - fdt { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - default = "conf"; - - conf { - description = "NAME"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt"; - }; - }; - }; - }; - - imx-boot { - filename = "flash.bin"; - pad-byte = <0x00>; - - spl: blob-ext@1 { - offset = <0x0>; - filename = "spl.bin"; - }; - - uboot: blob-ext@2 { - offset = <0x57c00>; - filename = "u-boot.itb"; - }; - }; -}; diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi index 6f90f4c738c..aa06acbe064 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi @@ -3,6 +3,7 @@ * Copyright (C) 2019 Kontron Electronics GmbH */ +#include "imx8mm-binman.dtsi" #include "imx8mm-u-boot.dtsi" / { @@ -11,10 +12,6 @@ usb1 = &usbotg2; }; - binman: binman { - multiple-images; - }; - wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -133,121 +130,3 @@ &wdog1 { u-boot,dm-spl; }; - -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - - u-boot-spl { - align-end = <4>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; - }; - - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; - }; - }; - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x920000>; - entry = <0x920000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - fdt { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - default = "conf"; - - conf { - description = "NAME"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt"; - }; - }; - }; - }; - - imx-boot { - filename = "flash.bin"; - pad-byte = <0x00>; - - spl: blob-ext@1 { - offset = <0x0>; - filename = "spl.bin"; - }; - - uboot: blob-ext@2 { - offset = <0x57c00>; - filename = "u-boot.itb"; - }; - }; -}; diff --git a/arch/arm/dts/imx8mm-venice-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-u-boot.dtsi index e0fa9ff4bfc..1bef06da562 100644 --- a/arch/arm/dts/imx8mm-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-u-boot.dtsi @@ -3,13 +3,10 @@ * Copyright 2021 Gateworks Corporation */ +#include "imx8mm-binman.dtsi" #include "imx8mm-u-boot.dtsi" / { - binman: binman { - multiple-images; - }; - wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -72,118 +69,3 @@ &wdog1 { u-boot,dm-spl; }; - -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - - u-boot-spl { - align-end = <4>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; - }; - - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; - }; - }; - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - fit,fdt-list = "of-list"; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x920000>; - entry = <0x920000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - @fdt-SEQ { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - }; - }; - - configurations { - default = "@config-DEFAULT-SEQ"; - - @config-SEQ { - description = "NAME"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt-SEQ"; - }; - }; - }; - }; - - imx-boot { - filename = "flash.bin"; - pad-byte = <0x00>; - - spl: blob-ext@1 { - filename = "spl.bin"; - offset = <0x0>; - }; - - uboot: blob-ext@2 { - filename = "u-boot.itb"; - offset = <0x57c00>; - }; - }; -}; diff --git a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi index 6962bb40b6e..5f7636f4450 100644 --- a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi @@ -3,13 +3,10 @@ * Copyright 2021 Toradex */ +#include "imx8mm-binman.dtsi" #include "imx8mm-u-boot.dtsi" / { - binman: binman { - multiple-images; - }; - firmware { optee { compatible = "linaro,optee-tz"; @@ -100,120 +97,6 @@ u-boot,dm-spl; }; -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - - u-boot-spl { - align-end = <4>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; - }; - - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; - }; - }; - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x920000>; - entry = <0x920000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - fdt { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - default = "conf"; - - conf { - description = "NAME"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt"; - }; - }; - }; - }; - - imx-boot { - filename = "flash.bin"; - pad-byte = <0x00>; - - spl: blob-ext@1 { - offset = <0x0>; - filename = "spl.bin"; - }; - - uboot: blob-ext@2 { - offset = <0x5fc00>; - filename = "u-boot.itb"; - }; - }; +&binman_uboot { + offset = <0x5fc00>; }; From patchwork Thu Aug 26 12:14:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1521075 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4GwMHh595Lz9t1s for ; Thu, 26 Aug 2021 22:15:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C726A83146; Thu, 26 Aug 2021 14:15:00 +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 B4D7D82F2B; Thu, 26 Aug 2021 14:14:42 +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.194]) (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 ADB6B82A01 for ; Thu, 26 Aug 2021 14:14:33 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MguSE-1mfJWf11YO-00M5lB; Thu, 26 Aug 2021 14:14:21 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Tim Harvey , Simon Glass , Frieder Schrempf , Stefano Babic , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Tom Rini Subject: [RFC PATCH v1 3/5] arm64: dts: imx8mm-binman.dtsi: alphabetically re-order properties Date: Thu, 26 Aug 2021 14:14:07 +0200 Message-Id: <20210826121409.220124-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210826121409.220124-1-marcel@ziswiler.com> References: <20210826121409.220124-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:34d+V/PGBKDcLRxgkcu4KZ3WHshdr35/nbX2sd1FrTJ66IBEk2u OGH/CSwHKLJDnYqWWkA2p4s+Fwr9kewPnafacQjRcbXOeNpZH1XAz+4X2Q0SB1GUsYO7zog r7SIulH4Sa/7a0UHOVMbfvvjCgh4xj0p5FOP3QJHd4pKnJELN1ytm6KmG03ESNkLXvd4D2t NJBmaoc1nzh7b16/nVnPw== X-UI-Out-Filterresults: notjunk:1;V03:K0:blQcc3ezcqQ=:Hg4VFbBSXBPF3pTgw472DP z0XYanCwRF3/t6zfWuwFj8khORUSPfq6D4MfClnMTyaqxmUu4xHJioy064hVAF5Dn4Ynp4v1r gsONmqrjQITC05Xv40Wy3QahwAv7n5kUB8moy4qjtpFUB8Qe0d2teuRlh99L3Au+rPB2TvQ5S DpShYFUD0I1ivgkoHSSUooPKqbJp5KD2hD00C6emSqKJe5YwwJ5QpCywpSskZmMoecnxjuwhR oLMOrO+YDtA6MxpjhFSvKpLwKZWt6gPn2ViBSaBU6NBPOayDNqw99BIEduSJFr9iLA9gJINFU wlq+O1n8O6pkHB/PSbf8dN6I/+9ixRq0mq+ANl5fTk5IVwlG83QO2DniHs5G0aDmKzPldg6se ok9xsYUPiMKq2aWHVD4vt7Cg2r9NekSgI6nPSHNiZ4vNLu7EPwO8j2MKm006qcYW28FSjqa9S 0hQ/ACL+EwH1Zt7oqQlW1UpGx8Y+WusHkfxBfGnTgqgZv22n93Lduvui0tDSQus2QxiM8zPEQ vY2IdBIz11QZGVcQzc89mIKc/NM08z3GZtUJVJHLE3fGWrRyYG81xXHfrHyOikZbHXc8eNEGz oR+6kxAdGqiSc88TYEtA5LQ6MCSmCQE486EAmRIBnV4mCYF0dAEAu8eylBKAc/RbxP9tbd5Yg 4ZWFg5K3MGTVZ8LVQ8Mr+4xK4poRdh4V7gUFnazJLE/RbnyELC99zUh0ma27TQsySmxZ4wnzW ujptwsmtlzJRncuge/bOeO0FnZF4llcnmwu13Q== 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 Alphabetically re-order properties. Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx8mm-binman.dtsi | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/dts/imx8mm-binman.dtsi b/arch/arm/dts/imx8mm-binman.dtsi index 2d98c1ef577..b7ab8d19934 100644 --- a/arch/arm/dts/imx8mm-binman.dtsi +++ b/arch/arm/dts/imx8mm-binman.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+ OR MIT /* * Copyright 2021 Toradex */ @@ -11,10 +11,10 @@ &binman { u-boot-spl-ddr { + align = <4>; + align-size = <4>; filename = "u-boot-spl-ddr.bin"; pad-byte = <0xff>; - align-size = <4>; - align = <4>; u-boot-spl { align-end = <4>; @@ -58,16 +58,16 @@ fit { description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; fit,external-offset = ; + #address-cells = <1>; images { uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; arch = "arm64"; compression = "none"; + description = "U-Boot (64-bit)"; load = ; + type = "standalone"; uboot_blob: blob-ext { filename = "u-boot-nodtb.bin"; @@ -75,12 +75,12 @@ }; atf { - description = "ARM Trusted Firmware"; - type = "firmware"; arch = "arm64"; compression = "none"; - load = <0x920000>; + description = "ARM Trusted Firmware"; entry = <0x920000>; + load = <0x920000>; + type = "firmware"; atf_blob: blob-ext { filename = "bl31.bin"; @@ -88,17 +88,17 @@ }; binman_fip: fip { - description = "Trusted Firmware FIP"; - type = "firmware"; arch = "arm64"; compression = "none"; + description = "Trusted Firmware FIP"; load = <0x40310000>; + type = "firmware"; }; fdt { + compression = "none"; description = "NAME"; type = "flat_dt"; - compression = "none"; uboot_fdt_blob: blob-ext { filename = "u-boot.dtb"; @@ -111,9 +111,9 @@ binman_configuration: conf { description = "NAME"; + fdt = "fdt"; firmware = "uboot"; loadables = "atf"; - fdt = "fdt"; }; }; }; @@ -124,13 +124,13 @@ pad-byte = <0x00>; spl: blob-ext@1 { - offset = <0x0>; filename = "spl.bin"; + offset = <0x0>; }; binman_uboot: blob-ext@2 { - offset = <0x57c00>; filename = "u-boot.itb"; + offset = <0x57c00>; }; }; }; From patchwork Thu Aug 26 12:14:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1521074 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GwMHR0ZcLz9svs for ; Thu, 26 Aug 2021 22:15:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F04682F2B; Thu, 26 Aug 2021 14:14:55 +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 0E8EB82A01; Thu, 26 Aug 2021 14:14:44 +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.194]) (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 15A2582EA5 for ; Thu, 26 Aug 2021 14:14:33 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MDiSu-1mFRBZ1IjO-00H6sR; Thu, 26 Aug 2021 14:14:23 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Tim Harvey , Simon Glass , Frieder Schrempf , Stefano Babic , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Tom Rini Subject: [RFC PATCH v1 4/5] arm64: dts: imx8mm-binman.dtsi: explicitly add spl filename Date: Thu, 26 Aug 2021 14:14:08 +0200 Message-Id: <20210826121409.220124-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210826121409.220124-1-marcel@ziswiler.com> References: <20210826121409.220124-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:0Nrq1bSrHyZM5g26yxOJiZcl1dI8EFNJlVXTSXHcBfwfyAI7fpe U+varSVLrZMvdqmSr0CRKHR7vKADpgFMmH9/kwtwxR9/ci+ujNR9+Ag6OO5Iz89PfforqAe wjE/Ru5Q8cQlAtc7scPeTCjM/4Owyn3F+RQ+nxAN5ZUd/HxqIs9K2L9qjQveRxt0B+XEqCc ZMBkSuXeukw+7GDdjvdNQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:mbS05YeCpqQ=:3djUyRkWQk3yDCCjvW2rUw T7GoHsWFT8ySoVXb50CmgiLe3ryyWmDTZbQtl5v47MzsmVSiBd2qmnuKv06HpBKmS9RUnPall ajD/vKIcziFFNTqefOB58ag+tnSP6+q0H3mpesoHx+jcKSsbRKZq/rxYsyv8oXgAlt7hmqnbn Kmsw+NxPmKNRpws47mHEDsKAVa+A3GsSI+m0MMBb6UJypuWYahE2G/BUk9E5f9cKSNQrR8RGF nL1QwexWQC5hl8OHCGMMgp4eI1HkLRMi9AYvnTlHkMo+1oFJUwKeecjirY7sq7W4VArLY6ceK aGreovA8CLukXYZ7ZGRcs7bOleqIx2MyUqiDDyr4lxcIISnmDuRLU1u9FB+A5ynnW/KA9vQiO bziCaREbD0f2ClnVhHJehTv5aVJyvQ/npueQKe3XIRKerTZoRTmQJaGBEY+Vvgq15ZDi1CTDG EDtc5MlOylX7f7M+sp9O8eZZbj0AkJQcyP+KxgcHInvck7WfeAe6hk6VWXiuF/36yVSF++F99 KcOKwuvIS/3bJHaPHNRUnheci1D/JxcajW15oLbHdRkE2izkfjgHxcQ/CeXuXPMiC27/Zh3ZX Gu9lBRC6yMlni9rxy9bSt1VDhQJ3vlIvpRCGaChg6GL2z6mFu7iV/xjb9eh2LDeRgQ5qxtDgY jMHQuFqPzXmYNp8Nfn3x/7yZHPESXpZvGT+jF/Z3qntMscgIA/mY3XUiAKqDTQPCkDPmw6yZG unIxNNvoi02Y37+KcIp82Bc+esJ/WU2GpenKCA== 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 Explicitly add SPL aka u-boot-spl.bin filename. Signed-off-by: Marcel Ziswiler --- arch/arm/dts/imx8mm-binman.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/imx8mm-binman.dtsi b/arch/arm/dts/imx8mm-binman.dtsi index b7ab8d19934..1d2895d8970 100644 --- a/arch/arm/dts/imx8mm-binman.dtsi +++ b/arch/arm/dts/imx8mm-binman.dtsi @@ -17,6 +17,7 @@ pad-byte = <0xff>; u-boot-spl { + filename = "u-boot-spl.bin"; align-end = <4>; }; From patchwork Thu Aug 26 12:14:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1521076 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GwMHs1r25z9t18 for ; Thu, 26 Aug 2021 22:15:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A483783123; Thu, 26 Aug 2021 14:15:14 +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 30A3582DF7; Thu, 26 Aug 2021 14:14:48 +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_H2, 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.196]) (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 BC3BB83123 for ; Thu, 26 Aug 2021 14:14:34 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MF5uX-1mGGWw1bFD-00GHve; Thu, 26 Aug 2021 14:14:25 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Tim Harvey , Simon Glass , Frieder Schrempf , Stefano Babic , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Tom Rini Subject: [RFC PATCH v1 5/5] arm64: dts: imx8mm-binman.dtsi: improve odd blob-ext naming Date: Thu, 26 Aug 2021 14:14:09 +0200 Message-Id: <20210826121409.220124-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210826121409.220124-1-marcel@ziswiler.com> References: <20210826121409.220124-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Wpasb3JN7fkUs+DhRooFDB9lyYb4AXULJR07OukkzuEc/sXTqSM X6LDdSRoLSfKa3xjw8aBCoFop3+hC81KSGS+5KOaDNp4QmYrlkRXicxjXdxtlyieI+9Cikg 5Ry/pQHdmn6Nk3g1u60+D4HyM9EhJXBsg+vogRFriNyMvA2mqjcdgCGtN76pTScD1VFBy5U L8FMi8z/fI20gHcocGecg== X-UI-Out-Filterresults: notjunk:1;V03:K0:cuorjSDz0PE=:XydSa8hbEupKNoA4hfEoZD wQQGRnRMCIxX2ms2ncUXwEebArRUXQk72vthx412PGhis+xGvLn7WfotDK93k4HrSXy2nlvZJ Ms2saV0qXA1/i4pNqdXoYDzJ7VxOvlhsXvLi/sbKJ1kfR5MYiUmAC1ETHXhhCwyRb9itf9eTZ FNzrzXm7BAEvKt3pKyy0WkaNok1WwJYaQCrRq+i5NJYkfuUT3KexOFJpY94bjJbMP4Lt8f/9e 3uHsjZgW13qWjW6rbv7Lu9QUMFFipMsWM5cwtJpd1QpWafLkr3d9Gb81Ce5NLVUMKMyygRDC8 /mIv1049cNJhoy6nG1d4WtciCdVmpLbpwL4uBewrSACQQUu0H8N5XhiJPYRxcvbgAOlhF+gG9 cGRbI6Yk/bCGzJLGc8aBOcWxSsWxiHShI3f98Q0kWKcoD1atPat/+4cnBjeMzgUPGCj7FE4my 66X+MMxjyzJdGWTyKW6wOYrKtUsISRulzTsT260zGtxigQLS60jVAeEQR3gJ5Z2CTbm0Mnmp5 md5P2dRgv1YMHdjOOdlOj3ox20TWGmQ8xt0hGOzFhDjXoUffrrOdKO//ZL72X1+qE4fesurN+ H9xLohO/5KJgXYBC/7U1VNCOVlWZerysog8xwAIcG6A+U8gQl1c8uLqSv+4gL8pFFzqfyiAeB sRF+SF+sUeRbyvUrUChm/dshsQEKHhxb8gd9nQto1BuXxp5ls4U77sCthxRZ6MJ0El09PVg2y MOI8Q0B2qUAMF06L/NIa2UrvHDrm3NgcwqHtgg== 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 Rather than using odd implicit blob-ext naming, explicitly specify the type to be of blob-ext and therefore also simplify the node naming. Signed-off-by: Marcel Ziswiler --- Changes in v1: - This was suggested by Simon on my earlier patch set upon which we decided to first break this up into a common binman dtsi and then subsequently do such further improvements. arch/arm/dts/imx8mm-binman.dtsi | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/imx8mm-binman.dtsi b/arch/arm/dts/imx8mm-binman.dtsi index 1d2895d8970..42f5246c30a 100644 --- a/arch/arm/dts/imx8mm-binman.dtsi +++ b/arch/arm/dts/imx8mm-binman.dtsi @@ -21,24 +21,28 @@ align-end = <4>; }; - blob_1: blob-ext@1 { + 1d-imem { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_2: blob-ext@2 { + 1d_dmem { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; - blob_3: blob-ext@3 { + 2d_imem { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_4: blob-ext@4 { + 2d_dmem { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; }; @@ -70,8 +74,9 @@ load = ; type = "standalone"; - uboot_blob: blob-ext { + uboot_blob { filename = "u-boot-nodtb.bin"; + type = "blob-ext"; }; }; @@ -83,8 +88,9 @@ load = <0x920000>; type = "firmware"; - atf_blob: blob-ext { + atf_blob { filename = "bl31.bin"; + type = "blob-ext"; }; }; @@ -101,8 +107,9 @@ description = "NAME"; type = "flat_dt"; - uboot_fdt_blob: blob-ext { + uboot_fdt_blob { filename = "u-boot.dtb"; + type = "blob-ext"; }; }; }; @@ -124,14 +131,16 @@ filename = "flash.bin"; pad-byte = <0x00>; - spl: blob-ext@1 { + spl { filename = "spl.bin"; offset = <0x0>; + type = "blob-ext"; }; - binman_uboot: blob-ext@2 { + binman_uboot: uboot { filename = "u-boot.itb"; offset = <0x57c00>; + type = "blob-ext"; }; }; };