summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2023-05-26 13:53:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2023-05-26 13:53:44 +0200
commit4cbc1f59ccc37a0eefc825b2eca54f8656a06d3b (patch)
treeb5c1e25294cb33f81455fdcbeafca6e64c6d04b0
parent03abfad9639e865edf770e858c5218ce33728b20 (diff)
linux: update to 6.1.30
-rw-r--r--mk/linux-ver.mk4
-rw-r--r--target/linux/Config.in.kernelversion2
-rw-r--r--target/linux/patches/6.1.30/board-rockpi4-0003-arm64-dts-pcie.patch (renamed from target/linux/patches/6.1.22/board-rockpi4-0003-arm64-dts-pcie.patch)0
-rw-r--r--target/linux/patches/6.1.30/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/6.1.22/enable-ethernet-bpi-m2-plus.patch)0
-rw-r--r--target/linux/patches/6.1.30/riscv32.patch (renamed from target/linux/patches/6.1.22/riscv32.patch)0
-rw-r--r--target/linux/patches/6.1.30/rockchip-115200.patch (renamed from target/linux/patches/6.1.22/rockchip-115200.patch)0
-rw-r--r--target/linux/patches/6.1.30/rockchip-pcie-timeout.patch (renamed from target/linux/patches/6.1.22/rockchip-pcie-timeout.patch)0
7 files changed, 3 insertions, 3 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index bbf805ebf..c8b3b0404 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -16,10 +16,10 @@ KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y)
-KERNEL_FILE_VER:= 6.1.22
+KERNEL_FILE_VER:= 6.1.30
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 2be89141cef74d0e5a55540d203eb8010dfddb3c82d617e66b058f20b19cfda8
+KERNEL_HASH:= 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y)
KERNEL_FILE_VER:= 5.15.105
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index f6caca3bd..547d6292d 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -36,7 +36,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
config ADK_TARGET_LINUX_KERNEL_VERSION_6_1
- bool "6.1.22"
+ bool "6.1.30"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_C6X
diff --git a/target/linux/patches/6.1.22/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.30/board-rockpi4-0003-arm64-dts-pcie.patch
index 1777e7a86..1777e7a86 100644
--- a/target/linux/patches/6.1.22/board-rockpi4-0003-arm64-dts-pcie.patch
+++ b/target/linux/patches/6.1.30/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/target/linux/patches/6.1.22/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.30/enable-ethernet-bpi-m2-plus.patch
index 7e9abd9ce..7e9abd9ce 100644
--- a/target/linux/patches/6.1.22/enable-ethernet-bpi-m2-plus.patch
+++ b/target/linux/patches/6.1.30/enable-ethernet-bpi-m2-plus.patch
diff --git a/target/linux/patches/6.1.22/riscv32.patch b/target/linux/patches/6.1.30/riscv32.patch
index 648b0de4d..648b0de4d 100644
--- a/target/linux/patches/6.1.22/riscv32.patch
+++ b/target/linux/patches/6.1.30/riscv32.patch
diff --git a/target/linux/patches/6.1.22/rockchip-115200.patch b/target/linux/patches/6.1.30/rockchip-115200.patch
index ad8a2d7a7..ad8a2d7a7 100644
--- a/target/linux/patches/6.1.22/rockchip-115200.patch
+++ b/target/linux/patches/6.1.30/rockchip-115200.patch
diff --git a/target/linux/patches/6.1.22/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.30/rockchip-pcie-timeout.patch
index 2ef7df2da..2ef7df2da 100644
--- a/target/linux/patches/6.1.22/rockchip-pcie-timeout.patch
+++ b/target/linux/patches/6.1.30/rockchip-pcie-timeout.patch