MIPS: generic: Update node names to avoid unit addresses

commit e607ff630c6053ecc67502677c0e50053d7892d4 upstream.

With the latest mkimage from U-Boot 2021.04, the generic defconfigs no
longer build, failing with:

/usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1

This is expected after the linked U-Boot commits because '@' is
forbidden in the node names due to the way that libfdt treats nodes with
the same prefix but different unit addresses.

Switch the '@' in the node name to '-'. Drop the unit addresses from the
hash and kernel child nodes because there is only one node so they do
not need to have a number to differentiate them.

Cc: stable@vger.kernel.org
Link: https://source.denx.de/u-boot/u-boot/-/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4
Link: https://source.denx.de/u-boot/u-boot/-/commit/3f04db891a353f4b127ed57279279f851c6b4917
Suggested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
[nathan: Backport to 5.10, only apply to .its.S files that exist]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/mips/generic/board-boston.its.S b/arch/mips/generic/board-boston.its.S
index a7f51f97b9102f79dd4e75fa1894ee42e24e099e..c45ad27594218c6e2f19d1b7451c34173abad294 100644 (file)
--- a/arch/mips/generic/board-boston.its.S
+++ b/arch/mips/generic/board-boston.its.S
@@ -1,22 +1,22 @@
 / {
        images {
-               fdt@boston {
+               fdt-boston {
                        description = "img,boston Device Tree";
                        data = /incbin/("boot/dts/img/boston.dtb");
                        type = "flat_dt";
                        arch = "mips";
                        compression = "none";
-                       hash@0 {
+                       hash {
                                algo = "sha1";
                        };
                };
        };
 
        configurations {
-               conf@boston {
+               conf-boston {
                        description = "Boston Linux kernel";
-                       kernel = "kernel@0";
-                       fdt = "fdt@boston";
+                       kernel = "kernel";
+                       fdt = "fdt-boston";
                };
        };
 };

diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
index e4cb4f95a8cc1015f31d63570c962703b7fddca8..0a2e8f7a8526f3532ea40e2067cd0ea1da07e950 100644 (file)
--- a/arch/mips/generic/board-ni169445.its.S
+++ b/arch/mips/generic/board-ni169445.its.S
@@ -1,22 +1,22 @@
 / {
        images {
-               fdt@ni169445 {
+               fdt-ni169445 {
                        description = "NI 169445 device tree";
                        data = /incbin/("boot/dts/ni/169445.dtb");
                        type = "flat_dt";
                        arch = "mips";
                        compression = "none";
-                       hash@0 {
+                       hash {
                                algo = "sha1";
                        };
                };
        };
 
        configurations {
-               conf@ni169445 {
+               conf-ni169445 {
                        description = "NI 169445 Linux Kernel";
-                       kernel = "kernel@0";
-                       fdt = "fdt@ni169445";
+                       kernel = "kernel";
+                       fdt = "fdt-ni169445";
                };
        };
 };

diff --git a/arch/mips/generic/board-ocelot.its.S b/arch/mips/generic/board-ocelot.its.S
index 3da23988149a66e0fec419f2fee93108d4fce64a..8c7e3a1b68d3da410e0bacbe5d58003ee4bc3802 100644 (file)
--- a/arch/mips/generic/board-ocelot.its.S
+++ b/arch/mips/generic/board-ocelot.its.S
@@ -1,40 +1,40 @@
 /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
 / {
        images {
-               fdt@ocelot_pcb123 {
+               fdt-ocelot_pcb123 {
                        description = "MSCC Ocelot PCB123 Device Tree";
                        data = /incbin/("boot/dts/mscc/ocelot_pcb123.dtb");
                        type = "flat_dt";
                        arch = "mips";
                        compression = "none";
-                       hash@0 {
+                       hash {
                                algo = "sha1";
                        };
                };
 
-               fdt@ocelot_pcb120 {
+               fdt-ocelot_pcb120 {
                        description = "MSCC Ocelot PCB120 Device Tree";
                        data = /incbin/("boot/dts/mscc/ocelot_pcb120.dtb");
                        type = "flat_dt";
                        arch = "mips";
                        compression = "none";
-                       hash@0 {
+                       hash {
                                algo = "sha1";
                        };
                };
        };
 
        configurations {
-               conf@ocelot_pcb123 {
+               conf-ocelot_pcb123 {
                        description = "Ocelot Linux kernel";
-                       kernel = "kernel@0";
-                       fdt = "fdt@ocelot_pcb123";
+                       kernel = "kernel";
+                       fdt = "fdt-ocelot_pcb123";
                };
 
-               conf@ocelot_pcb120 {
+               conf-ocelot_pcb120 {
                        description = "Ocelot Linux kernel";
-                       kernel = "kernel@0";
-                       fdt = "fdt@ocelot_pcb120";
+                       kernel = "kernel";
+                       fdt = "fdt-ocelot_pcb120";
                };
        };
 };

diff --git a/arch/mips/generic/board-xilfpga.its.S b/arch/mips/generic/board-xilfpga.its.S
index a2e773d3f14f411c51d9c4dd039e12a6b8288cd6..08c1e900eb4ed3b261efd00980bb743e129100de 100644 (file)
--- a/arch/mips/generic/board-xilfpga.its.S
+++ b/arch/mips/generic/board-xilfpga.its.S
@@ -1,22 +1,22 @@
 / {
        images {
-               fdt@xilfpga {
+               fdt-xilfpga {
                        description = "MIPSfpga (xilfpga) Device Tree";
                        data = /incbin/("boot/dts/xilfpga/nexys4ddr.dtb");
                        type = "flat_dt";
                        arch = "mips";
                        compression = "none";
-                       hash@0 {
+                       hash {
                                algo = "sha1";
                        };
                };
        };
 
        configurations {
-               conf@xilfpga {
+               conf-xilfpga {
                        description = "MIPSfpga Linux kernel";
-                       kernel = "kernel@0";
-                       fdt = "fdt@xilfpga";
+                       kernel = "kernel";
+                       fdt = "fdt-xilfpga";
                };
        };
 };

diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index 1a08438fd8930c43eb543cc64bbc2ba787a1b939..3e254676540f45ba787fa65a81b742dc74df4653 100644 (file)
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -6,7 +6,7 @@
        #address-cells = <ADDR_CELLS>;
 
        images {
-               kernel@0 {
+               kernel {
                        description = KERNEL_NAME;
                        data = /incbin/(VMLINUX_BINARY);
                        type = "kernel";
@@ -15,18 +15,18 @@
                        compression = VMLINUX_COMPRESSION;
                        load = /bits/ ADDR_BITS <VMLINUX_LOAD_ADDRESS>;
                        entry = /bits/ ADDR_BITS <VMLINUX_ENTRY_ADDRESS>;
-                       hash@0 {
+                       hash {
                                algo = "sha1";
                        };
                };
        };
 
        configurations {
-               default = "conf@default";
+               default = "conf-default";
 
-               conf@default {
+               conf-default {
                        description = "Generic Linux kernel";
-                       kernel = "kernel@0";
+                       kernel = "kernel";
                };
        };
 };