linux: update to 5.4.193

13 files changed, 3 insertions, 55 deletions

diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 6b2de55d0..52648efe3 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -28,10 +28,10 @@ KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		d56965afc9b6a3d26d53db40ccd37fd9d15f2ca6bfd54ef6f0f8b6e92c170999
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y)
-KERNEL_FILE_VER:=	5.4.179
+KERNEL_FILE_VER:=	5.4.193
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		2c9bdec0922a95aff34e8d53d2e0ecf7e842033cd908d2959a43d34afb5d897d
+KERNEL_HASH:=		0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y)
 KERNEL_FILE_VER:=	4.19.213
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 228ddca35..0206923db 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -52,7 +52,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_10
 	depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_5_4
-	bool "5.4.179"
+	bool "5.4.193"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_CRIS
diff --git a/target/linux/patches/5.4.179/riscv.patch b/target/linux/patches/5.4.179/riscv.patch
deleted file mode 100644
index cc9018d47..000000000
--- a/target/linux/patches/5.4.179/riscv.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6df2a016c0c8a3d0933ef33dd192ea6606b115e3 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Wed, 26 Jan 2022 18:14:42 +0100
-Subject: riscv: fix build with binutils 2.38
-
-From version 2.38, binutils default to ISA spec version 20191213. This
-means that the csr read/write (csrr*/csrw*) instructions and fence.i
-instruction has separated from the `I` extension, become two standalone
-extensions: Zicsr and Zifencei. As the kernel uses those instruction,
-this causes the following build failure:
-
-  CC      arch/riscv/kernel/vdso/vgettimeofday.o
-  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h: Assembler messages:
-  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
-  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
-  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
-  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
-
-The fix is to specify those extensions explicitely in -march. However as
-older binutils version do not support this, we first need to detect
-that.
-
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Tested-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
----
- arch/riscv/Makefile | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-(limited to 'arch/riscv')
-
-diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
-index 8a107ed18b0dc..7d81102cffd48 100644
---- a/arch/riscv/Makefile
-+++ b/arch/riscv/Makefile
-@@ -50,6 +50,12 @@ riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima
- riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima
- riscv-march-$(CONFIG_FPU)		:= $(riscv-march-y)fd
- riscv-march-$(CONFIG_RISCV_ISA_C)	:= $(riscv-march-y)c
-+
-+# Newer binutils versions default to ISA spec version 20191213 which moves some
-+# instructions from the I extension to the Zicsr and Zifencei extensions.
-+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(riscv-march-y)_zicsr_zifencei)
-+riscv-march-$(toolchain-need-zicsr-zifencei) := $(riscv-march-y)_zicsr_zifencei
-+
- KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y))
- KBUILD_AFLAGS += -march=$(riscv-march-y)
- 
--- 
-cgit 
-
diff --git a/target/linux/patches/5.4.179/arc.patch b/target/linux/patches/5.4.193/arc.patch
index 20810ce64..20810ce64 100644
--- a/target/linux/patches/5.4.179/arc.patch
+++ b/target/linux/patches/5.4.193/arc.patch
diff --git a/target/linux/patches/5.4.179/arm-nommu.patch b/target/linux/patches/5.4.193/arm-nommu.patch
index fdcec3f09..fdcec3f09 100644
--- a/target/linux/patches/5.4.179/arm-nommu.patch
+++ b/target/linux/patches/5.4.193/arm-nommu.patch
diff --git a/target/linux/patches/5.4.179/darwin-dtc.patch b/target/linux/patches/5.4.193/darwin-dtc.patch
index 0cdc23ab4..0cdc23ab4 100644
--- a/target/linux/patches/5.4.179/darwin-dtc.patch
+++ b/target/linux/patches/5.4.193/darwin-dtc.patch
diff --git a/target/linux/patches/5.4.179/darwin-file2alias.patch b/target/linux/patches/5.4.193/darwin-file2alias.patch
index fdbc598a8..fdbc598a8 100644
--- a/target/linux/patches/5.4.179/darwin-file2alias.patch
+++ b/target/linux/patches/5.4.193/darwin-file2alias.patch
diff --git a/target/linux/patches/5.4.179/dtc-noyaml.patch b/target/linux/patches/5.4.193/dtc-noyaml.patch
index 759bb01f7..759bb01f7 100644
--- a/target/linux/patches/5.4.179/dtc-noyaml.patch
+++ b/target/linux/patches/5.4.193/dtc-noyaml.patch
diff --git a/target/linux/patches/5.4.179/macsonic.patch b/target/linux/patches/5.4.193/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/5.4.179/macsonic.patch
+++ b/target/linux/patches/5.4.193/macsonic.patch
diff --git a/target/linux/patches/5.4.179/or1k-more-ram.patch b/target/linux/patches/5.4.193/or1k-more-ram.patch
index 540dc43b5..540dc43b5 100644
--- a/target/linux/patches/5.4.179/or1k-more-ram.patch
+++ b/target/linux/patches/5.4.193/or1k-more-ram.patch
diff --git a/target/linux/patches/5.4.179/relocs.patch b/target/linux/patches/5.4.193/relocs.patch
index 5bcd974c7..5bcd974c7 100644
--- a/target/linux/patches/5.4.179/relocs.patch
+++ b/target/linux/patches/5.4.193/relocs.patch
diff --git a/target/linux/patches/5.4.179/sh4.patch b/target/linux/patches/5.4.193/sh4.patch
index 8ae79d49d..8ae79d49d 100644
--- a/target/linux/patches/5.4.179/sh4.patch
+++ b/target/linux/patches/5.4.193/sh4.patch
diff --git a/target/linux/patches/5.4.179/startup.patch b/target/linux/patches/5.4.193/startup.patch
index 081aa103a..081aa103a 100644
--- a/target/linux/patches/5.4.179/startup.patch
+++ b/target/linux/patches/5.4.193/startup.patch