imx: Drop unneeded phandle in FIT template

Adding a phandle to a template node is not allowed, since when the node is
instantiated multiple times, we end up with duplicate phandles.

Drop this invalid constructs.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Tim Harvey <tharvey@gateworks.com>

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 484e31824b8573036a7c3b46c38821d1017c5fbf..d93e1cbd8a7153b1f8c16949268ccda90f275ab8 100644 (file)
--- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
@@ -41,9 +41,11 @@
        };
 };
 
+/* This cannot work since it refers to a template node
 &binman_configuration {
        loadables = "atf", "fip";
 };
+*/
 
 &fec1 {
        phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 035282bf0b0029d478db8bf2c6c15d592dc717a9..6085128e24ecb9adbddfbe923f44f2a1940ce153 100644 (file)
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -140,7 +140,7 @@
                        configurations {
                                default = "@config-DEFAULT-SEQ";
 
-                               binman_configuration: @config-SEQ {
+                               @config-SEQ {
                                        description = "NAME";
                                        fdt = "fdt-SEQ";
                                        firmware = "uboot";

diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index 5046b38e4e292fa88512074e3f94a35e0e02f97d..bc57566a108f5cbd515183236f4379e3d088b79d 100644 (file)
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -204,7 +204,7 @@
                        configurations {
                                default = "@config-DEFAULT-SEQ";
 
-                               binman_configuration: @config-SEQ {
+                               @config-SEQ {
                                        description = "NAME";
                                        fdt = "fdt-SEQ";
                                        firmware = "uboot";

diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
index f3fb44046d5ca9220954e65514965524a838fb62..c4ea536b29bb77672bb3c52c701e34e87b64cb80 100644 (file)
--- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
@@ -162,6 +162,8 @@
        };
 };
 
+/* This cannot work since it refers to a template node
 &binman_configuration {
        loadables = "atf", "fip";
 };
+*/

diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index 36e7444a627be5c56429c06f4a4eb05ac4914470..200938a980727c965cd31603af46931de971b848 100644 (file)
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -146,7 +146,7 @@
                                        type = "flat_dt";
                                        compression = "none";
 
-                                       uboot_fdt_blob: blob-ext {
+                                       blob-ext {
                                                filename = "u-boot.dtb";
                                        };
                                };
@@ -155,7 +155,7 @@
                        configurations {
                                default = "@config-DEFAULT-SEQ";
 
-                               binman_configuration: @config-SEQ {
+                               @config-SEQ {
                                        description = "NAME";
                                        fdt = "fdt-SEQ";
                                        firmware = "uboot";

diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi
index a3e0af48109b9850521065699bb4ee9c88167496..d316e869516f9ecbdbe8fd0c44f63aa3bf01cda0 100644 (file)
--- a/arch/arm/dts/imx8qm-u-boot.dtsi
+++ b/arch/arm/dts/imx8qm-u-boot.dtsi
@@ -112,7 +112,7 @@
                        configurations {
                                default = "@config-DEFAULT-SEQ";
 
-                               binman_configuration: @config-SEQ {
+                               @config-SEQ {
                                        description = "NAME";
                                        fdt = "fdt-SEQ";
                                        firmware = "uboot";

diff --git a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
index 3ecb461b0110201d8679f88f82bfed0b30b5dae1..64318d09cf0a6f6b26daa5d74dfe04b163e0a4cc 100644 (file)
--- a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
+++ b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
@@ -41,7 +41,7 @@
                                        os = "arm-trusted-firmware";
                                        load = <CONFIG_K3_ATF_LOAD_ADDR>;
                                        entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf: atf-bl31 {
+                                       atf-bl31 {
                                        };
                                };
 
@@ -53,7 +53,7 @@
                                        os = "tee";
                                        load = <0x9e800000>;
                                        entry = <0x9e800000>;
-                                       tee: tee-os {
+                                       tee-os {
                                        };
                                };
 
@@ -78,7 +78,7 @@
                                        compression = "none";
                                        load = <CONFIG_SPL_TEXT_BASE>;
                                        entry = <CONFIG_SPL_TEXT_BASE>;
-                                       u_boot_spl_nodtb: blob-ext {
+                                       blob-ext {
                                                filename = "spl/u-boot-spl-nodtb.bin";
                                        };
                                };
@@ -88,7 +88,7 @@
                                        type = "flat_dt";
                                        arch = "arm";
                                        compression = "none";
-                                       spl_am65x_evm_dtb: blob-ext {
+                                       blob-ext {
                                                filename = "spl/dts/k3-am65-iot2050-spl.dtb";
                                        };
                                };