From: Marcel Ziswiler <marcel.ziswi...@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.ziswi...@toradex.com>
Reviewed-by: Peng Fan <peng....@nxp.com>

---

Changes in v3:
- Integrated imx8mm_beacon as well.
- Re-based on top of imx/master.

Changes in v2:
- Morph common binman dtsi into regular common u-boot dtsi as discussed
  on mailing list.
- Re-based.

 arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi    | 122 ----------------
 .../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 +---------------
 7 files changed, 147 insertions(+), 701 deletions(-)

diff --git a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi 
b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi
index 3c034a85e35..73ddfdade6a 100644
--- a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi
@@ -6,10 +6,6 @@
 #include "imx8mm-u-boot.dtsi"
 
 / {
-       binman: binman {
-               multiple-images;
-       };
-
        wdt-reboot {
                compatible = "wdt-reboot";
                wdt = <&wdog1>;
@@ -104,121 +100,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-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 <ja...@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 9fb4d8aa8c2..976399ad602 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

Reply via email to