From: Greg Kroah-Hartman Date: Fri, 25 Jun 2021 10:25:01 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.12.14~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b984ae98a044e56e3f2d380e4d20fac22937b18;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: mips-generic-update-node-names-to-avoid-unit-addresses.patch --- diff --git a/queue-5.4/mips-generic-update-node-names-to-avoid-unit-addresses.patch b/queue-5.4/mips-generic-update-node-names-to-avoid-unit-addresses.patch new file mode 100644 index 00000000000..c3a523178d4 --- /dev/null +++ b/queue-5.4/mips-generic-update-node-names-to-avoid-unit-addresses.patch @@ -0,0 +1,217 @@ +From foo@baz Fri Jun 25 12:17:55 PM CEST 2021 +From: Nathan Chancellor +Date: Fri, 9 Apr 2021 12:21:28 -0700 +Subject: MIPS: generic: Update node names to avoid unit addresses + +From: Nathan Chancellor + +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 +Signed-off-by: Nathan Chancellor +Reviewed-by: Tom Rini +Signed-off-by: Thomas Bogendoerfer +[nathan: Backport to 5.4, only apply to .its.S files that exist] +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/generic/board-boston.its.S | 10 +++++----- + arch/mips/generic/board-ni169445.its.S | 10 +++++----- + arch/mips/generic/board-ocelot.its.S | 20 ++++++++++---------- + arch/mips/generic/board-xilfpga.its.S | 10 +++++----- + arch/mips/generic/vmlinux.its.S | 10 +++++----- + 5 files changed, 30 insertions(+), 30 deletions(-) + +--- 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"; + }; + }; + }; +--- 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"; + }; + }; + }; +--- 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"; + }; + }; + }; +--- 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"; + }; + }; + }; +--- a/arch/mips/generic/vmlinux.its.S ++++ b/arch/mips/generic/vmlinux.its.S +@@ -6,7 +6,7 @@ + #address-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 ; + entry = /bits/ ADDR_BITS ; +- 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"; + }; + }; + }; diff --git a/queue-5.4/series b/queue-5.4/series index 8f76d81a7d8..f61133b5d32 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -7,3 +7,4 @@ arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch mmc-meson-gx-use-memcpy_to-fromio-for-dram-access-quirk.patch kbuild-add-config_ld_is_lld.patch arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch +mips-generic-update-node-names-to-avoid-unit-addresses.patch