* [RFC PATCH v1 1/5] imx8mm-cl-iot-gate: fix imximage intermediate binary naming
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
@ 2021-08-26 12:14 ` Marcel Ziswiler
2021-08-26 12:14 ` [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi Marcel Ziswiler
` (5 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-26 12:14 UTC (permalink / raw)
To: u-boot
Cc: Fabio Estevam, Tim Harvey, Simon Glass, Frieder Schrempf,
Stefano Babic, Marcel Ziswiler, Kirill Kapranov, Peng Fan,
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>
---
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] 16+ messages in thread* [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
2021-08-26 12:14 ` [RFC PATCH v1 1/5] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
@ 2021-08-26 12:14 ` Marcel Ziswiler
2021-08-26 14:57 ` Tim Harvey
2021-08-27 9:21 ` Teresa Remmet
2021-08-26 12:14 ` [RFC PATCH v1 3/5] arm64: dts: imx8mm-binman.dtsi: alphabetically re-order properties Marcel Ziswiler
` (4 subsequent siblings)
6 siblings, 2 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-26 12:14 UTC (permalink / raw)
To: u-boot
Cc: Fabio Estevam, Tim Harvey, Simon Glass, Frieder Schrempf,
Stefano Babic, 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. Introduce a new common
imx8mm-binman.dtsi which covers the common part of that configuration.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
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 = <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";
+ };
+ };
+
+ 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 = <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";
- };
- };
-
- 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 = <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-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 = <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-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 = <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 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 = <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] 16+ messages in thread* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-26 12:14 ` [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi Marcel Ziswiler
@ 2021-08-26 14:57 ` Tim Harvey
2021-08-26 16:01 ` Marcel Ziswiler
2021-10-06 23:51 ` Marcel Ziswiler
2021-08-27 9:21 ` Teresa Remmet
1 sibling, 2 replies; 16+ messages in thread
From: Tim Harvey @ 2021-08-26 14:57 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: u-boot, Fabio Estevam, Simon Glass, Frieder Schrempf,
Stefano Babic, Marcel Ziswiler, NXP i.MX U-Boot Team, Tom Rini
On Thu, Aug 26, 2021 at 5:14 AM Marcel Ziswiler <marcel@ziswiler.com> 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. Introduce a new common
> imx8mm-binman.dtsi which covers the common part of that configuration.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> ---
>
> 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 = <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";
> + };
> + };
> +
> + 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";
> + };
> + };
> +};
<snip>
> 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 = <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";
> - };
> - };
> - };
> - };
> -
Marcel,
This would break imx8mm-venice.
The of-list, @fdt-SEQ and @config-SEQ are required to support
automatic generation of fdt and config nodes when you have multiple
device-trees. See tools/binman/entries.rst for details.
Currently, imx8mm-venice is the only board that uses multiple dtbs in
CONFIG_OF_LIST so this would be the only board broken by your patch.
I'm curious if just using the of-list, @fdt-SEQ and @config-SEQ as
above works fine for boards with a single dtb? Otherwise I suppose
boards like mine can include your common "imx8mm-binman.dtsi" but will
have to leave the &binman node override.
Best regards,
Tim
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-26 14:57 ` Tim Harvey
@ 2021-08-26 16:01 ` Marcel Ziswiler
2021-10-06 23:51 ` Marcel Ziswiler
1 sibling, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-26 16:01 UTC (permalink / raw)
To: tharvey; +Cc: festevam, u-boot, uboot-imx, sjg, sbabic, frieder.schrempf, trini
Hi Tim
On Thu, 2021-08-26 at 07:57 -0700, Tim Harvey wrote:
> ...
> Marcel,
>
> This would break imx8mm-venice.
Sure, that's why I made it an RFC. I was just missing some context.
> The of-list, @fdt-SEQ and @config-SEQ are required to support
> automatic generation of fdt and config nodes when you have multiple
> device-trees. See tools/binman/entries.rst for details.
Thanks for that pointer, that explains a lot.
> Currently, imx8mm-venice is the only board that uses multiple dtbs in
> CONFIG_OF_LIST so this would be the only board broken by your patch.
> I'm curious if just using the of-list, @fdt-SEQ and @config-SEQ as
> above works fine for boards with a single dtb? Otherwise I suppose
> boards like mine can include your common "imx8mm-binman.dtsi" but will
> have to leave the &binman node override.
Yes, let me investigate further and find a suitable solution. Expect a v2 with that shortly.
> Best regards,
>
> Tim
Cheers
Marcel
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-26 14:57 ` Tim Harvey
2021-08-26 16:01 ` Marcel Ziswiler
@ 2021-10-06 23:51 ` Marcel Ziswiler
1 sibling, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-10-06 23:51 UTC (permalink / raw)
To: tharvey; +Cc: festevam, u-boot, uboot-imx, sjg, sbabic, frieder.schrempf, trini
Hi Tim
On Thu, 2021-08-26 at 07:57 -0700, Tim Harvey wrote:
> ...
> Marcel,
>
> This would break imx8mm-venice.
>
> The of-list, @fdt-SEQ and @config-SEQ are required to support
> automatic generation of fdt and config nodes when you have multiple
> device-trees. See tools/binman/entries.rst for details.
>
> Currently, imx8mm-venice is the only board that uses multiple dtbs in
> CONFIG_OF_LIST so this would be the only board broken by your patch.
> I'm curious if just using the of-list, @fdt-SEQ and @config-SEQ as
> above works fine for boards with a single dtb?
Yes, I verified that now and will be sending a v2 with that shortly. Thanks!
> Otherwise I suppose
> boards like mine can include your common "imx8mm-binman.dtsi" but will
> have to leave the &binman node override.
>
> Best regards,
>
> Tim
Cheers
Marcel
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-26 12:14 ` [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi Marcel Ziswiler
2021-08-26 14:57 ` Tim Harvey
@ 2021-08-27 9:21 ` Teresa Remmet
2021-08-27 10:59 ` Marcel Ziswiler
1 sibling, 1 reply; 16+ messages in thread
From: Teresa Remmet @ 2021-08-27 9:21 UTC (permalink / raw)
To: marcel, u-boot
Cc: uboot-imx, marcel.ziswiler, trini, festevam, sbabic, tharvey,
sjg, frieder.schrempf
Hello Marcel,
Am Donnerstag, den 26.08.2021, 14:14 +0200 schrieb Marcel Ziswiler:
> 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. Introduce a new
> common
> imx8mm-binman.dtsi which covers the common part of that
> configuration.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> ---
>
> 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
is it really necessary to create a new binman include? I have added the
nodes for imx8mp directly to the imx8mp-u-boot.dtsi. I guess you did
this because not all boards are converted yet. But I have tried this
when I moved binman to the common include for imx8mp. As the phycore-
imx8mp was also not converted at that point. It did not hurt having the
binman nodes included. At least back then.
I just not like to see that the file structure diverges. If there is a
good reason I'd rather also move the binman nodes for imx8mp to a
imx8mp-binman.dtsi.
Regards,
Teresa
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-27 9:21 ` Teresa Remmet
@ 2021-08-27 10:59 ` Marcel Ziswiler
2021-08-27 15:12 ` Tim Harvey
0 siblings, 1 reply; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-27 10:59 UTC (permalink / raw)
To: u-boot, T.Remmet
Cc: festevam, trini, uboot-imx, sbabic, tharvey, frieder.schrempf, sjg
Hi Teresa
On Fri, 2021-08-27 at 09:21 +0000, Teresa Remmet wrote:
> Hello Marcel,
>
> Am Donnerstag, den 26.08.2021, 14:14 +0200 schrieb Marcel Ziswiler:
> > 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. Introduce a new
> > common
> > imx8mm-binman.dtsi which covers the common part of that
> > configuration.
> >
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> >
> > ---
> >
> > 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
>
> is it really necessary to create a new binman include?
No, I guess not. That's just what we loosely discussed. But this is also exactly why I only posted it as an RFC
to get such feedback.
> I have added the
> nodes for imx8mp directly to the imx8mp-u-boot.dtsi. I guess you did
> this because not all boards are converted yet. But I have tried this
> when I moved binman to the common include for imx8mp. As the phycore-
> imx8mp was also not converted at that point. It did not hurt having the
> binman nodes included. At least back then.
Yes, maybe we can indeed just put it all into the same imx8mp-u-boot.dtsi. If nobody objects to that idea I can
try it that way for a v2.
> I just not like to see that the file structure diverges. If there is a
> good reason I'd rather also move the binman nodes for imx8mp to a
> imx8mp-binman.dtsi.
No, I guess either way will work. Let's hope we get some more feedback on what the others prefer. Thanks!
> Regards,
> Teresa
Cheers
Marcel
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-27 10:59 ` Marcel Ziswiler
@ 2021-08-27 15:12 ` Tim Harvey
2021-08-28 12:55 ` Marcel Ziswiler
0 siblings, 1 reply; 16+ messages in thread
From: Tim Harvey @ 2021-08-27 15:12 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: u-boot, T.Remmet, festevam, trini, uboot-imx, sbabic,
frieder.schrempf, sjg
On Fri, Aug 27, 2021 at 3:59 AM Marcel Ziswiler
<marcel.ziswiler@toradex.com> wrote:
>
> Hi Teresa
>
> On Fri, 2021-08-27 at 09:21 +0000, Teresa Remmet wrote:
> > Hello Marcel,
> >
> > Am Donnerstag, den 26.08.2021, 14:14 +0200 schrieb Marcel Ziswiler:
> > > 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. Introduce a new
> > > common
> > > imx8mm-binman.dtsi which covers the common part of that
> > > configuration.
> > >
> > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > >
> > > ---
> > >
> > > 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
> >
> > is it really necessary to create a new binman include?
>
> No, I guess not. That's just what we loosely discussed. But this is also exactly why I only posted it as an RFC
> to get such feedback.
>
> > I have added the
> > nodes for imx8mp directly to the imx8mp-u-boot.dtsi. I guess you did
> > this because not all boards are converted yet. But I have tried this
> > when I moved binman to the common include for imx8mp. As the phycore-
> > imx8mp was also not converted at that point. It did not hurt having the
> > binman nodes included. At least back then.
>
> Yes, maybe we can indeed just put it all into the same imx8mp-u-boot.dtsi. If nobody objects to that idea I can
> try it that way for a v2.
>
>
> > I just not like to see that the file structure diverges. If there is a
> > good reason I'd rather also move the binman nodes for imx8mp to a
> > imx8mp-binman.dtsi.
>
> No, I guess either way will work. Let's hope we get some more feedback on what the others prefer. Thanks!
>
I'm not sure if I understand correctly but if the suggestion is to
create a dtsi that is shared between the imx8mm and imx8mp I don't
think that would be a good idea as there are differences in addresses
and such. In fact, there's a difference in DDR training firmware
between ddr3 and lpddr4 so trying to even combine them into an
imx8mm-u-boot.dtsi doesn't even make sense to me. If anything maybe it
should be a imx8mm-binman-lpddr4-u-boot.dtsi or something like that?
Perhaps ifdef's could handle these differences allowing you to combine
ddr types and SoC's?
Tim
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi
2021-08-27 15:12 ` Tim Harvey
@ 2021-08-28 12:55 ` Marcel Ziswiler
0 siblings, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-28 12:55 UTC (permalink / raw)
To: tharvey
Cc: uboot-imx, trini, festevam, sbabic, frieder.schrempf, u-boot,
T.Remmet, sjg
Hi Tim
On Fri, 2021-08-27 at 08:12 -0700, Tim Harvey wrote:
> ...
> > > > +++ b/arch/arm/dts/imx8mm-binman.dtsi
> > >
> > > is it really necessary to create a new binman include?
> >
> > No, I guess not. That's just what we loosely discussed. But this is also exactly why I only posted it as an
> > RFC
> > to get such feedback.
> >
> > > I have added the
> > > nodes for imx8mp directly to the imx8mp-u-boot.dtsi. I guess you did
> > > this because not all boards are converted yet. But I have tried this
> > > when I moved binman to the common include for imx8mp. As the phycore-
> > > imx8mp was also not converted at that point. It did not hurt having the
> > > binman nodes included. At least back then.
> >
> > Yes, maybe we can indeed just put it all into the same imx8mp-u-boot.dtsi. If nobody objects to that idea I
> > can
> > try it that way for a v2.
> >
> >
> > > I just not like to see that the file structure diverges. If there is a
> > > good reason I'd rather also move the binman nodes for imx8mp to a
> > > imx8mp-binman.dtsi.
> >
> > No, I guess either way will work. Let's hope we get some more feedback on what the others prefer. Thanks!
> >
>
> I'm not sure if I understand correctly but if the suggestion is to
> create a dtsi that is shared between the imx8mm and imx8mp I don't
> think that would be a good idea as there are differences in addresses
> and such. In fact, there's a difference in DDR training firmware
> between ddr3 and lpddr4 so trying to even combine them into an
> imx8mm-u-boot.dtsi doesn't even make sense to me. If anything maybe it
> should be a imx8mm-binman-lpddr4-u-boot.dtsi or something like that?
No, I don't think it is our intention to combine anything from imx8mm and imx8mp at this point. As far as I
understood, rather than introducing a new imx8mm-binman.dtsi the suggestion is to put that into the existing
imx8mm-u-boot.dtsi as well similar to how Teresa did that for phycore-imx8mp and the imx8mp-u-boot.dtsi.
> Perhaps ifdef's could handle these differences allowing you to combine
> ddr types and SoC's?
No, I don't really think that would improve anything over just having separate imx8mm-u-boot.dtsi and imx8mp-u-
boot.dtsi files. On the other hand, I also don't see that anything would stop us from still going down that
route of further combining imx8mm and imx8mp stuff in the future should we really want to.
> Tim
Cheers
Marcel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC PATCH v1 3/5] arm64: dts: imx8mm-binman.dtsi: alphabetically re-order properties
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
2021-08-26 12:14 ` [RFC PATCH v1 1/5] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
2021-08-26 12:14 ` [RFC PATCH v1 2/5] arm64: dts: imx8mm: add common -binman.dtsi Marcel Ziswiler
@ 2021-08-26 12:14 ` Marcel Ziswiler
2021-08-26 12:14 ` [RFC PATCH v1 4/5] arm64: dts: imx8mm-binman.dtsi: explicitly add spl filename Marcel Ziswiler
` (3 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-26 12:14 UTC (permalink / raw)
To: u-boot
Cc: Fabio Estevam, Tim Harvey, Simon Glass, Frieder Schrempf,
Stefano Babic, 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>
---
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 = <CONFIG_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 = <CONFIG_SYS_TEXT_BASE>;
+ 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>;
};
};
};
--
2.26.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [RFC PATCH v1 4/5] arm64: dts: imx8mm-binman.dtsi: explicitly add spl filename
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (2 preceding siblings ...)
2021-08-26 12:14 ` [RFC PATCH v1 3/5] arm64: dts: imx8mm-binman.dtsi: alphabetically re-order properties Marcel Ziswiler
@ 2021-08-26 12:14 ` Marcel Ziswiler
2021-08-26 12:14 ` [RFC PATCH v1 5/5] arm64: dts: imx8mm-binman.dtsi: improve odd blob-ext naming Marcel Ziswiler
` (2 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-26 12:14 UTC (permalink / raw)
To: u-boot
Cc: Fabio Estevam, Tim Harvey, Simon Glass, Frieder Schrempf,
Stefano Babic, 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>
---
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>;
};
--
2.26.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [RFC PATCH v1 5/5] arm64: dts: imx8mm-binman.dtsi: improve odd blob-ext naming
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (3 preceding siblings ...)
2021-08-26 12:14 ` [RFC PATCH v1 4/5] arm64: dts: imx8mm-binman.dtsi: explicitly add spl filename Marcel Ziswiler
@ 2021-08-26 12:14 ` Marcel Ziswiler
2021-08-26 14:58 ` [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Tim Harvey
2021-09-02 17:08 ` Fabio Estevam
6 siblings, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-08-26 12:14 UTC (permalink / raw)
To: u-boot
Cc: Fabio Estevam, Tim Harvey, Simon Glass, Frieder Schrempf,
Stefano Babic, 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 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 = <CONFIG_SYS_TEXT_BASE>;
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";
};
};
};
--
2.26.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (4 preceding siblings ...)
2021-08-26 12:14 ` [RFC PATCH v1 5/5] arm64: dts: imx8mm-binman.dtsi: improve odd blob-ext naming Marcel Ziswiler
@ 2021-08-26 14:58 ` Tim Harvey
2021-09-02 17:08 ` Fabio Estevam
6 siblings, 0 replies; 16+ messages in thread
From: Tim Harvey @ 2021-08-26 14:58 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: u-boot, Fabio Estevam, Simon Glass, Frieder Schrempf,
Stefano Babic, Marcel Ziswiler, Kirill Kapranov,
NXP i.MX U-Boot Team, Peng Fan, Tom Rini, Valentin Raevsky,
Ying-Chun Liu (PaulLiu)
On Thu, Aug 26, 2021 at 5:27 AM Marcel Ziswiler <marcel@ziswiler.com> 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. Introduce a new common
> imx8mm-binman.dtsi which covers the common part of that configuration.
>
> 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], Tim's switching imx8mm_venice to
> using binman to pack images [4] and Frieder's support for Kontron
> Electronics i.MX6UL/ULL and i.MX8MM SoMs [5].
>
> This series has been run-time tested on Verdin iMX8M Mini. The other
> targets were only compile tested.
>
> Please note that for now, I left out the following intricacies of
> imx8mm-venice-u-boot.dtsi. Not quite sure what exactly those are used
> for.
>
> fit,fdt-list = "of-list";
> ...
> @fdt-SEQ {
> ...
> default = "@config-DEFAULT-SEQ";
> ...
> @config-SEQ {
> ...
> fdt = "fdt-SEQ";
>
Marcell,
The of-list, @fdt-SEQ and @config-SEQ are required to support
automatic generation of fdt and config nodes when you have multiple
device-trees. See tools/binman/entries.rst for details.
Currently imx8mm-venice is the only imx8mm board that uses
CONFIG_OF_LIST to support multiple dtbs.
Tim
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up
2021-08-26 12:14 [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
` (5 preceding siblings ...)
2021-08-26 14:58 ` [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Tim Harvey
@ 2021-09-02 17:08 ` Fabio Estevam
2021-10-06 23:53 ` Marcel Ziswiler
6 siblings, 1 reply; 16+ messages in thread
From: Fabio Estevam @ 2021-09-02 17:08 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: U-Boot-Denx, Tim Harvey, Simon Glass, Frieder Schrempf,
Stefano Babic, Marcel Ziswiler, Kirill Kapranov,
NXP i.MX U-Boot Team, Peng Fan, Tom Rini, Valentin Raevsky,
Ying-Chun Liu (PaulLiu)
Hi Marcel,
On Thu, Aug 26, 2021 at 9:14 AM Marcel Ziswiler <marcel@ziswiler.com> 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. Introduce a new common
> imx8mm-binman.dtsi which covers the common part of that configuration.
>
> 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], Tim's switching imx8mm_venice to
> using binman to pack images [4] and Frieder's support for Kontron
> Electronics i.MX6UL/ULL and i.MX8MM SoMs [5].
>
> This series has been run-time tested on Verdin iMX8M Mini. The other
> targets were only compile tested.
>
> Please note that for now, I left out the following intricacies of
> imx8mm-venice-u-boot.dtsi. Not quite sure what exactly those are used
> for.
The series looks good.
We just need to find a way to not break imx8mm-venice.
Thanks
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [RFC PATCH v1 0/5] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up
2021-09-02 17:08 ` Fabio Estevam
@ 2021-10-06 23:53 ` Marcel Ziswiler
0 siblings, 0 replies; 16+ messages in thread
From: Marcel Ziswiler @ 2021-10-06 23:53 UTC (permalink / raw)
To: festevam
Cc: paul.liu, uboot-imx, kirill.kapranov, trini, peng.fan, sbabic,
tharvey, valentin, sjg, u-boot, frieder.schrempf
On Thu, 2021-09-02 at 14:08 -0300, Fabio Estevam wrote:
> Hi Marcel,
>
> On Thu, Aug 26, 2021 at 9:14 AM Marcel Ziswiler <marcel@ziswiler.com> 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. Introduce a new common
> > imx8mm-binman.dtsi which covers the common part of that configuration.
> >
> > 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], Tim's switching imx8mm_venice to
> > using binman to pack images [4] and Frieder's support for Kontron
> > Electronics i.MX6UL/ULL and i.MX8MM SoMs [5].
> >
> > This series has been run-time tested on Verdin iMX8M Mini. The other
> > targets were only compile tested.
> >
> > Please note that for now, I left out the following intricacies of
> > imx8mm-venice-u-boot.dtsi. Not quite sure what exactly those are used
> > for.
>
> The series looks good.
Thanks!
> We just need to find a way to not break imx8mm-venice.
Yep, yep. I cleaned that up now and will send a v2 shortly.
BTW: Now with 2021.10 released I hope somebody will pick up all my in-flight patch sets soon (;-p).
> Thanks
^ permalink raw reply [flat|nested] 16+ messages in thread