Commit e607ff63 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Thomas Bogendoerfer
Browse files

MIPS: generic: Update node names to avoid unit addresses 

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: default avatarSimon Glass <sjg@chromium.org>
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarTom Rini <trini@konsulko.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent ddb002d6

arch/mips/generic/board-boston.its.S

+5 −5
Original line number Diff line number Diff line 
/ {

	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";

		};

	};

};

arch/mips/generic/board-jaguar2.its.S

+8 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */

/ {

	images {

		fdt@jaguar2_pcb110 {

		fdt-jaguar2_pcb110 {

			description = "MSCC Jaguar2 PCB110 Device Tree";

			data = /incbin/("boot/dts/mscc/jaguar2_pcb110.dtb");

			type = "flat_dt";

			arch = "mips";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

			};

		};

		fdt@jaguar2_pcb111 {

		fdt-jaguar2_pcb111 {

			description = "MSCC Jaguar2 PCB111 Device Tree";

			data = /incbin/("boot/dts/mscc/jaguar2_pcb111.dtb");

			type = "flat_dt";

			arch = "mips";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

			};

		};
@@ -26,14 +26,14 @@ 
	configurations {

		pcb110 {

			description = "Jaguar2 Linux kernel";

			kernel = "kernel@0";

			fdt = "fdt@jaguar2_pcb110";

			kernel = "kernel";

			fdt = "fdt-jaguar2_pcb110";

			ramdisk = "ramdisk";

		};

		pcb111 {

			description = "Jaguar2 Linux kernel";

			kernel = "kernel@0";

			fdt = "fdt@jaguar2_pcb111";

			kernel = "kernel";

			fdt = "fdt-jaguar2_pcb111";

			ramdisk = "ramdisk";

		};

	};

arch/mips/generic/board-luton.its.S

+4 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */

/ {

	images {

		fdt@luton_pcb091 {

		fdt-luton_pcb091 {

			description = "MSCC Luton PCB091 Device Tree";

			data = /incbin/("boot/dts/mscc/luton_pcb091.dtb");

			type = "flat_dt";

			arch = "mips";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

			};

		};
@@ -16,8 +16,8 @@ 
	configurations {

		pcb091 {

			description = "Luton Linux kernel";

			kernel = "kernel@0";

			fdt = "fdt@luton_pcb091";

			kernel = "kernel";

			fdt = "fdt-luton_pcb091";

		};

	};

};

arch/mips/generic/board-ni169445.its.S

+5 −5
Original line number Diff line number Diff line 
/ {

	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";

		};

	};

};

arch/mips/generic/board-ocelot.its.S

+10 −10
Original line number Diff line number Diff line 
/* 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";

		};

	};

};