From 6f95070074458efb5d24ea8e1eac0d0dc99d3e9b Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 27 Nov 2022 18:05:53 -0500 Subject: [PATCH] Fixes for 4.19 Signed-off-by: Sasha Levin --- .../nios2-add-force-for-vmlinuz.gz.patch | 37 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.19/nios2-add-force-for-vmlinuz.gz.patch diff --git a/queue-4.19/nios2-add-force-for-vmlinuz.gz.patch b/queue-4.19/nios2-add-force-for-vmlinuz.gz.patch new file mode 100644 index 00000000000..761907cdfcc --- /dev/null +++ b/queue-4.19/nios2-add-force-for-vmlinuz.gz.patch @@ -0,0 +1,37 @@ +From 5df511a4688053fac1f8a2bb1531c8dd8d7de5fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Nov 2022 19:20:53 -0800 +Subject: nios2: add FORCE for vmlinuz.gz + +From: Randy Dunlap + +[ Upstream commit 869e4ae4cd2a23d625aaa14ae62dbebf768cb77d ] + +Add FORCE to placate a warning from make: + +arch/nios2/boot/Makefile:24: FORCE prerequisite is missing + +Fixes: 2fc8483fdcde ("nios2: Build infrastructure") +Signed-off-by: Randy Dunlap +Reviewed-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + arch/nios2/boot/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile +index 2ba23a679732..70139de9a0df 100644 +--- a/arch/nios2/boot/Makefile ++++ b/arch/nios2/boot/Makefile +@@ -20,7 +20,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE + $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE + $(call if_changed,gzip) + +-$(obj)/vmImage: $(obj)/vmlinux.gz ++$(obj)/vmImage: $(obj)/vmlinux.gz FORCE + $(call if_changed,uimage) + @$(kecho) 'Kernel: $@ is ready' + +-- +2.35.1 + diff --git a/queue-4.19/series b/queue-4.19/series index a8a4c3b1051..bb720eac639 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -32,3 +32,4 @@ nfc-st-nci-fix-incorrect-validating-logic-in-evt_tra.patch nfc-st-nci-fix-memory-leaks-in-evt_transaction.patch net-thunderx-fix-the-acpi-memory-leak.patch s390-crashdump-fix-tod-programmable-field-size.patch +nios2-add-force-for-vmlinuz.gz.patch -- 2.47.3