Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 822564cd authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Sasha Levin
Browse files

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: 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>
[nathan: Backport to 4.19, only apply to .its.S files that exist]
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6edee499

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

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

/ {

	images {

	images {

		fdt@boston {

		fdt-boston {

			description = "img,boston Device Tree";

			description = "img,boston Device Tree";

			data = /incbin/("boot/dts/img/boston.dtb");

			data = /incbin/("boot/dts/img/boston.dtb");

			type = "flat_dt";

			type = "flat_dt";

			arch = "mips";

			arch = "mips";

			compression = "none";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

				algo = "sha1";

			};

			};

		};

		};

	};

	};





	configurations {

	configurations {

		conf@boston {

		conf-boston {

			description = "Boston Linux kernel";

			description = "Boston Linux kernel";

			kernel = "kernel@0";

			kernel = "kernel";

			fdt = "fdt@boston";

			fdt = "fdt-boston";

		};

		};

	};

	};

};
 
};

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

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

/ {

	images {

	images {

		fdt@ni169445 {

		fdt-ni169445 {

			description = "NI 169445 device tree";

			description = "NI 169445 device tree";

			data = /incbin/("boot/dts/ni/169445.dtb");

			data = /incbin/("boot/dts/ni/169445.dtb");

			type = "flat_dt";

			type = "flat_dt";

			arch = "mips";

			arch = "mips";

			compression = "none";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

				algo = "sha1";

			};

			};

		};

		};

	};

	};





	configurations {

	configurations {

		conf@ni169445 {

		conf-ni169445 {

			description = "NI 169445 Linux Kernel";

			description = "NI 169445 Linux Kernel";

			kernel = "kernel@0";

			kernel = "kernel";

			fdt = "fdt@ni169445";

			fdt = "fdt-ni169445";

		};

		};

	};

	};

};
 
};

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

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

/ {

	images {

	images {

		fdt@xilfpga {

		fdt-xilfpga {

			description = "MIPSfpga (xilfpga) Device Tree";

			description = "MIPSfpga (xilfpga) Device Tree";

			data = /incbin/("boot/dts/xilfpga/nexys4ddr.dtb");

			data = /incbin/("boot/dts/xilfpga/nexys4ddr.dtb");

			type = "flat_dt";

			type = "flat_dt";

			arch = "mips";

			arch = "mips";

			compression = "none";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

				algo = "sha1";

			};

			};

		};

		};

	};

	};





	configurations {

	configurations {

		conf@xilfpga {

		conf-xilfpga {

			description = "MIPSfpga Linux kernel";

			description = "MIPSfpga Linux kernel";

			kernel = "kernel@0";

			kernel = "kernel";

			fdt = "fdt@xilfpga";

			fdt = "fdt-xilfpga";

		};

		};

	};

	};

};
 
};

arch/mips/generic/vmlinux.its.S

+5 −5
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
	#address-cells = <ADDR_CELLS>;

	#address-cells = <ADDR_CELLS>;





	images {

	images {

		kernel@0 {

		kernel {

			description = KERNEL_NAME;

			description = KERNEL_NAME;

			data = /incbin/(VMLINUX_BINARY);

			data = /incbin/(VMLINUX_BINARY);

			type = "kernel";

			type = "kernel";
@@ -15,18 +15,18 @@ 
			compression = VMLINUX_COMPRESSION;

			compression = VMLINUX_COMPRESSION;

			load = /bits/ ADDR_BITS <VMLINUX_LOAD_ADDRESS>;

			load = /bits/ ADDR_BITS <VMLINUX_LOAD_ADDRESS>;

			entry = /bits/ ADDR_BITS <VMLINUX_ENTRY_ADDRESS>;

			entry = /bits/ ADDR_BITS <VMLINUX_ENTRY_ADDRESS>;

			hash@0 {

			hash {

				algo = "sha1";

				algo = "sha1";

			};

			};

		};

		};

	};

	};





	configurations {

	configurations {

		default = "conf@default";

		default = "conf-default";





		conf@default {

		conf-default {

			description = "Generic Linux kernel";

			description = "Generic Linux kernel";

			kernel = "kernel@0";

			kernel = "kernel";

		};

		};

	};

	};

};
 
};