MIPS: fix allmodconfig build with latest mkimage
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Sat, 14 May 2022 15:34:14 +0000 (16:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 May 2022 07:42:50 +0000 (09:42 +0200)
With the latest mkimage from U-Boot 2021.04+ the allmodconfig build
fails. 822564cd3aa1 ("MIPS: generic: Update node names to avoid unit
addresses") was applied for similar build failure, but it was not
applied to 'arch/mips/generic/board-ocelot_pcb123.its.S' as that was
removed from upstream when the patch was applied.

Fixes: 822564cd3aa1 ("MIPS: generic: Update node names to avoid unit addresses")
Cc: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/generic/board-ocelot_pcb123.its.S

index 5a7d5e1c878aff5df0a7f44f18512cd30c1cb38c..6dd54b7c2f07621b0ffa5c05bac4b736722d164a 100644 (file)
@@ -1,23 +1,23 @@
 /* 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";
                        };
                };
        };
 
        configurations {
-               conf@ocelot_pcb123 {
+               conf-ocelot_pcb123 {
                        description = "Ocelot Linux kernel";
-                       kernel = "kernel@0";
-                       fdt = "fdt@ocelot_pcb123";
+                       kernel = "kernel";
+                       fdt = "fdt-ocelot_pcb123";
                };
        };
 };