* [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up
@ 2021-10-08 21:02 Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 1/7] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, Kirill Kapranov,
NXP i.MX U-Boot Team, Peng Fan, Tom Rini, Uri Mashiach,
Valentin Raevsky, Ying-Chun Liu (PaulLiu)
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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. Move the comon part of
that configuration to the common imx8mm-u-boot.dtsi include file.
The initial patch fixes an issue with intermediate binary naming for the
imx8mm-cl-iot-gate. And subsequent patches further clean up that dtsi.
This series is based on Peng's binman conversion of late [1], my Verdin
iMX8M Mini target refresh [2], Fabio's generating a single bootable
flash.bin again for imx8mm-evk [3] and Tim's switching imx8mm_venice to
using binman to pack images [4].
This series has been run-time tested on Verdin iMX8M Mini. The other
targets were only compile tested.
[1] https://marc.info/?l=u-boot&m=163366377832026
[2] https://marc.info/?l=u-boot&m=163365299927718
[3] https://marc.info/?l=u-boot&m=162972343709264
[4] https://marc.info/?l=u-boot&m=162983187605276
Changes in v2:
- New patch preparing cl-iot-gate.
- Morph common binman dtsi into regular common u-boot dtsi as discussed
on mailing list.
- Re-based.
- Rather than doing that clean-up to the separate binman dtsi now do it
to the common u-boot dtsi one.
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.
Marcel Ziswiler (7):
imx8mm-cl-iot-gate: fix imximage intermediate binary naming
arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order
arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common
imx8mm-u-boot.dtsi
arm64: dts: imx8mm: use common binman configuration
arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties
arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename
arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming
.../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 209 ++++--------------
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 188 +++-------------
arch/arm/dts/imx8mm-evk-u-boot.dtsi | 123 -----------
arch/arm/dts/imx8mm-u-boot.dtsi | 149 ++++++++++++-
arch/arm/dts/imx8mm-venice-u-boot.dtsi | 119 ----------
arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 122 +---------
.../imximage-8mm-lpddr4.cfg | 2 +-
7 files changed, 212 insertions(+), 700 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/7] imx8mm-cl-iot-gate: fix imximage intermediate binary naming
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 2/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order Marcel Ziswiler
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, Kirill Kapranov, Peng Fan,
Uri Mashiach, Valentin Raevsky, Ying-Chun Liu (PaulLiu)
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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 <marcel.ziswiler@toradex.com>
---
(no changes since v1)
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
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 1/7] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 3/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common imx8mm-u-boot.dtsi Marcel Ziswiler
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini,
Ying-Chun Liu (PaulLiu)
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Alphabetically re-order nodes and properties.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- New patch preparing cl-iot-gate.
.../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 202 +++++++++---------
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 202 +++++++++---------
2 files changed, 202 insertions(+), 202 deletions(-)
diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
index 12065935e49..67ce70d0bdf 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
@@ -8,18 +8,18 @@
multiple-images;
};
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
-
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
+
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ u-boot,dm-spl;
+ wdt = <&wdog1>;
+ };
};
&{/soc@0} {
@@ -27,17 +27,12 @@
u-boot,dm-spl;
};
-&clk {
+&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
};
-&osc_24m {
+&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
u-boot,dm-spl;
- u-boot,dm-pre-reloc;
};
&aips1 {
@@ -53,94 +48,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&pinctrl_uart3 {
- u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2 {
- u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
- u-boot,dm-spl;
-};
-
-&gpio1 {
- u-boot,dm-spl;
-};
-
-&gpio2 {
- u-boot,dm-spl;
-};
-
-&gpio3 {
- u-boot,dm-spl;
-};
-
-&gpio4 {
- u-boot,dm-spl;
-};
-
-&gpio5 {
- u-boot,dm-spl;
-};
-
-&uart3 {
- u-boot,dm-spl;
-};
-
-&usdhc1 {
- u-boot,dm-spl;
-};
-
-&usdhc2 {
- u-boot,dm-spl;
-};
-
-&usdhc3 {
- u-boot,dm-spl;
-};
-
-&i2c1 {
- u-boot,dm-spl;
-};
-
-&i2c2 {
- u-boot,dm-spl;
-};
-
-&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
-};
-
-&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
-};
-
-&pinctrl_i2c2 {
- u-boot,dm-spl;
-};
-
-&pinctrl_pmic {
- u-boot,dm-spl;
-};
-
-&fec1 {
- phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
-};
-
-&wdog1 {
- u-boot,dm-spl;
-};
-
&binman {
u-boot-spl-ddr {
filename = "u-boot-spl-ddr.bin";
@@ -253,3 +160,96 @@
};
};
};
+
+&clk {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+ /delete-property/ assigned-clocks;
+ /delete-property/ assigned-clock-parents;
+ /delete-property/ assigned-clock-rates;
+};
+
+&fec1 {
+ phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
+};
+
+&gpio1 {
+ u-boot,dm-spl;
+};
+
+&gpio2 {
+ u-boot,dm-spl;
+};
+
+&gpio3 {
+ u-boot,dm-spl;
+};
+
+&gpio4 {
+ u-boot,dm-spl;
+};
+
+&gpio5 {
+ u-boot,dm-spl;
+};
+
+&i2c1 {
+ u-boot,dm-spl;
+};
+
+&i2c2 {
+ u-boot,dm-spl;
+};
+
+&iomuxc {
+ u-boot,dm-spl;
+};
+
+&osc_24m {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+};
+
+&pinctrl_i2c2 {
+ u-boot,dm-spl;
+};
+
+&pinctrl_pmic {
+ u-boot,dm-spl;
+};
+
+&pinctrl_uart3 {
+ u-boot,dm-spl;
+};
+
+&pinctrl_usdhc2 {
+ u-boot,dm-spl;
+};
+
+&pinctrl_usdhc2_gpio {
+ u-boot,dm-spl;
+};
+
+&pinctrl_usdhc3 {
+ u-boot,dm-spl;
+};
+
+&uart3 {
+ u-boot,dm-spl;
+};
+
+&usdhc1 {
+ u-boot,dm-spl;
+};
+
+&usdhc2 {
+ u-boot,dm-spl;
+};
+
+&usdhc3 {
+ u-boot,dm-spl;
+};
+
+&wdog1 {
+ u-boot,dm-spl;
+};
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 00927c15744..fe45a35d751 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
@@ -8,18 +8,18 @@
multiple-images;
};
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
-
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
+
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ u-boot,dm-spl;
+ wdt = <&wdog1>;
+ };
};
&{/soc@0} {
@@ -27,17 +27,12 @@
u-boot,dm-spl;
};
-&clk {
+&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
};
-&osc_24m {
+&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
u-boot,dm-spl;
- u-boot,dm-pre-reloc;
};
&aips1 {
@@ -53,94 +48,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&pinctrl_uart3 {
- u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2 {
- u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
- u-boot,dm-spl;
-};
-
-&gpio1 {
- u-boot,dm-spl;
-};
-
-&gpio2 {
- u-boot,dm-spl;
-};
-
-&gpio3 {
- u-boot,dm-spl;
-};
-
-&gpio4 {
- u-boot,dm-spl;
-};
-
-&gpio5 {
- u-boot,dm-spl;
-};
-
-&uart3 {
- u-boot,dm-spl;
-};
-
-&usdhc1 {
- u-boot,dm-spl;
-};
-
-&usdhc2 {
- u-boot,dm-spl;
-};
-
-&usdhc3 {
- u-boot,dm-spl;
-};
-
-&i2c1 {
- u-boot,dm-spl;
-};
-
-&i2c2 {
- u-boot,dm-spl;
-};
-
-&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
-};
-
-&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
-};
-
-&pinctrl_i2c2 {
- u-boot,dm-spl;
-};
-
-&pinctrl_pmic {
- u-boot,dm-spl;
-};
-
-&fec1 {
- phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
-};
-
-&wdog1 {
- u-boot,dm-spl;
-};
-
&binman {
u-boot-spl-ddr {
filename = "u-boot-spl-ddr.bin";
@@ -241,3 +148,96 @@
};
};
};
+
+&clk {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+ /delete-property/ assigned-clocks;
+ /delete-property/ assigned-clock-parents;
+ /delete-property/ assigned-clock-rates;
+};
+
+&fec1 {
+ phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
+};
+
+&gpio1 {
+ u-boot,dm-spl;
+};
+
+&gpio2 {
+ u-boot,dm-spl;
+};
+
+&gpio3 {
+ u-boot,dm-spl;
+};
+
+&gpio4 {
+ u-boot,dm-spl;
+};
+
+&gpio5 {
+ u-boot,dm-spl;
+};
+
+&i2c1 {
+ u-boot,dm-spl;
+};
+
+&i2c2 {
+ u-boot,dm-spl;
+};
+
+&iomuxc {
+ u-boot,dm-spl;
+};
+
+&osc_24m {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+};
+
+&pinctrl_i2c2 {
+ u-boot,dm-spl;
+};
+
+&pinctrl_pmic {
+ u-boot,dm-spl;
+};
+
+&pinctrl_uart3 {
+ u-boot,dm-spl;
+};
+
+&pinctrl_usdhc2 {
+ u-boot,dm-spl;
+};
+
+&pinctrl_usdhc2_gpio {
+ u-boot,dm-spl;
+};
+
+&pinctrl_usdhc3 {
+ u-boot,dm-spl;
+};
+
+&uart3 {
+ u-boot,dm-spl;
+};
+
+&usdhc1 {
+ u-boot,dm-spl;
+};
+
+&usdhc2 {
+ u-boot,dm-spl;
+};
+
+&usdhc3 {
+ u-boot,dm-spl;
+};
+
+&wdog1 {
+ u-boot,dm-spl;
+};
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 3/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common imx8mm-u-boot.dtsi
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 1/7] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 2/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 4/7] arm64: dts: imx8mm: use common binman configuration Marcel Ziswiler
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini,
Ying-Chun Liu (PaulLiu)
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Use common imx8mm-u-boot.dtsi.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- New patch preparing cl-iot-gate.
.../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 37 +------------------
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 37 +------------------
2 files changed, 4 insertions(+), 70 deletions(-)
diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
index 67ce70d0bdf..bc8a138e6c0 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
@@ -3,6 +3,8 @@
* Copyright 2019 NXP
*/
+#include "imx8mm-u-boot.dtsi"
+
/ {
binman: binman {
multiple-images;
@@ -22,11 +24,6 @@
};
};
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
u-boot,dm-spl;
};
@@ -35,19 +32,6 @@
u-boot,dm-spl;
};
-&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips2 {
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
&binman {
u-boot-spl-ddr {
filename = "u-boot-spl-ddr.bin";
@@ -161,14 +145,6 @@
};
};
-&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
&fec1 {
phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
};
@@ -201,15 +177,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
&pinctrl_i2c2 {
u-boot,dm-spl;
};
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 fe45a35d751..cf3cc191d5a 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
@@ -3,6 +3,8 @@
* Copyright 2019 NXP
*/
+#include "imx8mm-u-boot.dtsi"
+
/ {
binman: binman {
multiple-images;
@@ -22,11 +24,6 @@
};
};
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
u-boot,dm-spl;
};
@@ -35,19 +32,6 @@
u-boot,dm-spl;
};
-&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips2 {
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
&binman {
u-boot-spl-ddr {
filename = "u-boot-spl-ddr.bin";
@@ -149,14 +133,6 @@
};
};
-&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
&fec1 {
phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
};
@@ -189,15 +165,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
&pinctrl_i2c2 {
u-boot,dm-spl;
};
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 4/7] arm64: dts: imx8mm: use common binman configuration
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (2 preceding siblings ...)
2021-10-08 21:02 ` [PATCH v2 3/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common imx8mm-u-boot.dtsi Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 5/7] arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties Marcel Ziswiler
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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. Move the comon part of
that configuration to the common imx8mm-u-boot.dtsi include file.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- Morph common binman dtsi into regular common u-boot dtsi as discussed
on mailing list.
- Re-based.
.../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 124 ++--------------
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 105 --------------
arch/arm/dts/imx8mm-evk-u-boot.dtsi | 123 ----------------
arch/arm/dts/imx8mm-u-boot.dtsi | 133 ++++++++++++++++++
arch/arm/dts/imx8mm-venice-u-boot.dtsi | 119 ----------------
arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 122 +---------------
6 files changed, 147 insertions(+), 579 deletions(-)
diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
index bc8a138e6c0..5cbc70faaaf 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
@@ -6,10 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
- binman: binman {
- multiple-images;
- };
-
firmware {
optee {
compatible = "linaro,optee-tz";
@@ -32,117 +28,21 @@
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>;
- };
+&binman_fip {
+ arch = "arm64";
+ compression = "none";
+ description = "Trusted Firmware FIP";
+ load = <0x40310000>;
+ type = "firmware";
- 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 = <CONFIG_FIT_EXTERNAL_OFFSET>;
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- 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 = "bl2.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";
};
&fec1 {
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 cf3cc191d5a..433b02cceee 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
@@ -6,10 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
- binman: binman {
- multiple-images;
- };
-
firmware {
optee {
compatible = "linaro,optee-tz";
@@ -32,107 +28,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>;
- };
- };
-
- flash {
- 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 = <CONFIG_FIT_EXTERNAL_OFFSET>;
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- 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";
- };
- };
- };
- };
-};
-
&fec1 {
phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
index 3c75415e8fb..6b459831e74 100644
--- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
@@ -6,10 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
- binman: binman {
- multiple-images;
- };
-
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
@@ -116,122 +112,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 = <CONFIG_FIT_EXTERNAL_OFFSET>;
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- 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-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index f833d9df59b..5020255fa0f 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -3,6 +3,12 @@
* Copyright (C) 2020 Jagan Teki <jagan@amarulasolutions.com>
*/
+/ {
+ binman: binman {
+ multiple-images;
+ };
+};
+
&{/soc@0} {
u-boot,dm-pre-reloc;
u-boot,dm-spl;
@@ -21,6 +27,133 @@
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 = <CONFIG_FIT_EXTERNAL_OFFSET>;
+ fit,fdt-list = "of-list";
+
+ images {
+ uboot {
+ description = "U-Boot (64-bit)";
+ type = "standalone";
+ arch = "arm64";
+ compression = "none";
+ load = <CONFIG_SYS_TEXT_BASE>;
+
+ 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-SEQ {
+ description = "NAME";
+ type = "flat_dt";
+ compression = "none";
+
+ uboot_fdt_blob: blob-ext {
+ filename = "u-boot.dtb";
+ };
+ };
+ };
+
+ configurations {
+ default = "@config-DEFAULT-SEQ";
+
+ binman_configuration: @config-SEQ {
+ description = "NAME";
+ firmware = "uboot";
+ loadables = "atf";
+ fdt = "fdt-SEQ";
+ };
+ };
+ };
+ };
+
+ 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";
+ };
+ };
+};
+
&clk {
u-boot,dm-spl;
u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/imx8mm-venice-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-u-boot.dtsi
index e0fa9ff4bfc..42b2903f040 100644
--- a/arch/arm/dts/imx8mm-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-u-boot.dtsi
@@ -6,10 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
- binman: binman {
- multiple-images;
- };
-
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
@@ -72,118 +68,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 = <CONFIG_FIT_EXTERNAL_OFFSET>;
- fit,fdt-list = "of-list";
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- 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 bf47930c36f..c50f2b01d4e 100644
--- a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi
@@ -6,10 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
- binman: binman {
- multiple-images;
- };
-
firmware {
optee {
compatible = "linaro,optee-tz";
@@ -100,120 +96,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 = <CONFIG_FIT_EXTERNAL_OFFSET>;
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- 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>;
};
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 5/7] arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (3 preceding siblings ...)
2021-10-08 21:02 ` [PATCH v2 4/7] arm64: dts: imx8mm: use common binman configuration Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 6/7] arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename Marcel Ziswiler
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Alphabetically re-order properties.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- Rather than doing that clean-up to the separate binman dtsi now do it
to the common u-boot dtsi one.
arch/arm/dts/imx8mm-u-boot.dtsi | 34 ++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 5020255fa0f..770282d2b98 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -15,8 +15,8 @@
};
&aips1 {
- u-boot,dm-spl;
u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
};
&aips2 {
@@ -29,10 +29,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>;
@@ -76,17 +76,17 @@
fit {
description = "Configuration to load ATF before U-Boot";
- #address-cells = <1>;
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
fit,fdt-list = "of-list";
+ #address-cells = <1>;
images {
uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
arch = "arm64";
compression = "none";
+ description = "U-Boot (64-bit)";
load = <CONFIG_SYS_TEXT_BASE>;
+ type = "standalone";
uboot_blob: blob-ext {
filename = "u-boot-nodtb.bin";
@@ -94,12 +94,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";
@@ -107,17 +107,17 @@
};
binman_fip: fip {
- description = "Trusted Firmware FIP";
- type = "firmware";
arch = "arm64";
compression = "none";
+ description = "Trusted Firmware FIP";
load = <0x40310000>;
+ type = "firmware";
};
@fdt-SEQ {
+ compression = "none";
description = "NAME";
type = "flat_dt";
- compression = "none";
uboot_fdt_blob: blob-ext {
filename = "u-boot.dtb";
@@ -130,9 +130,9 @@
binman_configuration: @config-SEQ {
description = "NAME";
+ fdt = "fdt-SEQ";
firmware = "uboot";
loadables = "atf";
- fdt = "fdt-SEQ";
};
};
};
@@ -143,20 +143,20 @@
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>;
};
};
};
&clk {
- u-boot,dm-spl;
u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
/delete-property/ assigned-clock-rates;
@@ -167,6 +167,6 @@
};
&osc_24m {
- u-boot,dm-spl;
u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
};
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 6/7] arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (4 preceding siblings ...)
2021-10-08 21:02 ` [PATCH v2 5/7] arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 7/7] arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming Marcel Ziswiler
2021-10-09 5:59 ` [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Peng Fan (OSS)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Explicitly add SPL aka u-boot-spl.bin filename.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- Rather than doing that clean-up to the separate binman dtsi now do it
to the common u-boot dtsi one.
arch/arm/dts/imx8mm-u-boot.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 770282d2b98..8feb0f2592a 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -36,6 +36,7 @@
u-boot-spl {
align-end = <4>;
+ filename = "u-boot-spl.bin";
};
blob_1: blob-ext@1 {
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 7/7] arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (5 preceding siblings ...)
2021-10-08 21:02 ` [PATCH v2 6/7] arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename Marcel Ziswiler
@ 2021-10-08 21:02 ` Marcel Ziswiler
2021-10-09 5:59 ` [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Peng Fan (OSS)
7 siblings, 0 replies; 9+ messages in thread
From: Marcel Ziswiler @ 2021-10-08 21:02 UTC (permalink / raw)
To: u-boot
Cc: Tim Harvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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 <marcel.ziswiler@toradex.com>
---
Changes in v2:
- Rather than doing that clean-up to the separate binman dtsi now do it
to the common u-boot dtsi one.
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-u-boot.dtsi | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 8feb0f2592a..7882fe73167 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -39,24 +39,28 @@
filename = "u-boot-spl.bin";
};
- 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";
};
};
@@ -89,8 +93,9 @@
load = <CONFIG_SYS_TEXT_BASE>;
type = "standalone";
- uboot_blob: blob-ext {
+ uboot_blob {
filename = "u-boot-nodtb.bin";
+ type = "blob-ext";
};
};
@@ -102,8 +107,9 @@
load = <0x920000>;
type = "firmware";
- atf_blob: blob-ext {
+ atf_blob {
filename = "bl31.bin";
+ type = "blob-ext";
};
};
@@ -120,8 +126,9 @@
description = "NAME";
type = "flat_dt";
- uboot_fdt_blob: blob-ext {
+ uboot_fdt_blob {
filename = "u-boot.dtb";
+ type = "blob-ext";
};
};
};
@@ -143,14 +150,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";
};
};
};
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (6 preceding siblings ...)
2021-10-08 21:02 ` [PATCH v2 7/7] arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming Marcel Ziswiler
@ 2021-10-09 5:59 ` Peng Fan (OSS)
7 siblings, 0 replies; 9+ messages in thread
From: Peng Fan (OSS) @ 2021-10-09 5:59 UTC (permalink / raw)
To: Marcel Ziswiler, u-boot
Cc: tharvey, Frieder Schrempf, Stefano Babic, Simon Glass,
Fabio Estevam, Marcel Ziswiler, Kirill Kapranov, dl-uboot-imx,
Peng Fan, Tom Rini, Uri Mashiach, valentin,
Ying-Chun Liu (PaulLiu)
On 2021/10/9 5:02, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
>
> 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. Move the comon part of
> that configuration to the common imx8mm-u-boot.dtsi include file.
>
> The initial patch fixes an issue with intermediate binary naming for the
> imx8mm-cl-iot-gate. And subsequent patches further clean up that dtsi.
>
> This series is based on Peng's binman conversion of late [1], my Verdin
> iMX8M Mini target refresh [2], Fabio's generating a single bootable
> flash.bin again for imx8mm-evk [3] and Tim's switching imx8mm_venice to
> using binman to pack images [4].
>
> This series has been run-time tested on Verdin iMX8M Mini. The other
> targets were only compile tested.
Thanks for the work.
Reviewed-by: Peng Fan <peng.fan@nxp.com> for the patchset.
>
> [1] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmarc.info%2F%3Fl%3Du-boot%26m%3D163366377832026&data=04%7C01%7Cpeng.fan%40nxp.com%7Cec53721a8d7145e87cb708d98a9efc40%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C637693237708724959%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=KlZvffel%2BO8mTBpGW5w0nEM%2BtP4DQFmNt4PglFz1mv4%3D&reserved=0
> [2] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmarc.info%2F%3Fl%3Du-boot%26m%3D163365299927718&data=04%7C01%7Cpeng.fan%40nxp.com%7Cec53721a8d7145e87cb708d98a9efc40%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C637693237708724959%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=X46kkPPpZWis0XForTOOLjsEfmJFabeZP1E0N%2Bpf%2BDc%3D&reserved=0
> [3] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmarc.info%2F%3Fl%3Du-boot%26m%3D162972343709264&data=04%7C01%7Cpeng.fan%40nxp.com%7Cec53721a8d7145e87cb708d98a9efc40%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C637693237708724959%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=4pjzBjyuys3PRE1X0mArki0%2Fq%2FG%2BvhsgCoxFM6I5PK0%3D&reserved=0
> [4] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmarc.info%2F%3Fl%3Du-boot%26m%3D162983187605276&data=04%7C01%7Cpeng.fan%40nxp.com%7Cec53721a8d7145e87cb708d98a9efc40%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C637693237708724959%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=m61TR7FDPnl7Weoz2Md%2FDeeMDqytq6VWS%2F7CeNv4Ais%3D&reserved=0
>
> Changes in v2:
> - New patch preparing cl-iot-gate.
> - Morph common binman dtsi into regular common u-boot dtsi as discussed
> on mailing list.
> - Re-based.
> - Rather than doing that clean-up to the separate binman dtsi now do it
> to the common u-boot dtsi one.
>
> 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.
>
> Marcel Ziswiler (7):
> imx8mm-cl-iot-gate: fix imximage intermediate binary naming
> arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order
> arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common
> imx8mm-u-boot.dtsi
> arm64: dts: imx8mm: use common binman configuration
> arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties
> arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename
> arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming
>
> .../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 209 ++++--------------
> arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 188 +++-------------
> arch/arm/dts/imx8mm-evk-u-boot.dtsi | 123 -----------
> arch/arm/dts/imx8mm-u-boot.dtsi | 149 ++++++++++++-
> arch/arm/dts/imx8mm-venice-u-boot.dtsi | 119 ----------
> arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 122 +---------
> .../imximage-8mm-lpddr4.cfg | 2 +-
> 7 files changed, 212 insertions(+), 700 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-10-09 5:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 1/7] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 2/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 3/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common imx8mm-u-boot.dtsi Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 4/7] arm64: dts: imx8mm: use common binman configuration Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 5/7] arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 6/7] arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 7/7] arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming Marcel Ziswiler
2021-10-09 5:59 ` [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Peng Fan (OSS)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).