4.19-stable patches

added patches:
	mips-generic-update-node-names-to-avoid-unit-addresses.patch

diff --git a/queue-4.19/mips-generic-update-node-names-to-avoid-unit-addresses.patch b/queue-4.19/mips-generic-update-node-names-to-avoid-unit-addresses.patch
new file mode 100644 (file)
index 0000000..c201b44
--- /dev/null
+++ b/queue-4.19/mips-generic-update-node-names-to-avoid-unit-addresses.patch
@@ -0,0 +1,163 @@
+From foo@baz Fri Jun 25 12:18:11 PM CEST 2021
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Fri, 9 Apr 2021 12:21:28 -0700
+Subject: MIPS: generic: Update node names to avoid unit addresses
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+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 <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 4.19, 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>
+---
+ arch/mips/generic/board-boston.its.S   |   10 +++++-----
+ arch/mips/generic/board-ni169445.its.S |   10 +++++-----
+ arch/mips/generic/board-xilfpga.its.S  |   10 +++++-----
+ arch/mips/generic/vmlinux.its.S        |   10 +++++-----
+ 4 files changed, 20 insertions(+), 20 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-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 = <ADDR_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 <VMLINUX_LOAD_ADDRESS>;
+                       entry = /bits/ ADDR_BITS <VMLINUX_ENTRY_ADDRESS>;
+-                      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-4.19/series b/queue-4.19/series
index cde50c69f42c13e11fa30ffa214031e09b78a169..21352e27c0ebdfc5a86cafcbbd5cc5292cb44a94 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -85,3 +85,4 @@ drm-nouveau-wait-for-moving-fence-after-pinning-v2.patch
 drm-radeon-wait-for-moving-fence-after-pinning.patch
 arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch
 makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch
+mips-generic-update-node-names-to-avoid-unit-addresses.patch