7bc73260c4
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:79af75f777Link:3f04db891aSuggested-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.4, 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>
41 lines
798 B
ArmAsm
41 lines
798 B
ArmAsm
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
|
|
/ {
|
|
images {
|
|
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 {
|
|
algo = "sha1";
|
|
};
|
|
};
|
|
|
|
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 {
|
|
algo = "sha1";
|
|
};
|
|
};
|
|
};
|
|
|
|
configurations {
|
|
conf-ocelot_pcb123 {
|
|
description = "Ocelot Linux kernel";
|
|
kernel = "kernel";
|
|
fdt = "fdt-ocelot_pcb123";
|
|
};
|
|
|
|
conf-ocelot_pcb120 {
|
|
description = "Ocelot Linux kernel";
|
|
kernel = "kernel";
|
|
fdt = "fdt-ocelot_pcb120";
|
|
};
|
|
};
|
|
};
|