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 484e318..d93e1cb 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 035282b..6085128 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 5046b38..bc57566 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 f3fb440..c4ea536 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 36e7444..200938a 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 a3e0af4..d316e86 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 3ecb461..64318d0 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";
                                        };
                                };