summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2023-07-21 14:09:05 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2023-07-21 14:09:05 +0200
commit905469dd9baccce44181b8129ffe191591e8c1a9 (patch)
treecd95ff8f5e02ac2a2cd787ad9bb2bb978b79d6d3
parent00816e590d31caca6b14c5e16586d85aed38f4fd (diff)
linux: update 6.1.x
-rw-r--r--mk/linux-ver.mk4
-rw-r--r--target/linux/Config.in.kernelversion2
-rw-r--r--target/linux/patches/6.1.39/board-rockpi4-0003-arm64-dts-pcie.patch (renamed from target/linux/patches/6.1.37/board-rockpi4-0003-arm64-dts-pcie.patch)0
-rw-r--r--target/linux/patches/6.1.39/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/6.1.37/enable-ethernet-bpi-m2-plus.patch)0
-rw-r--r--target/linux/patches/6.1.39/riscv32.patch (renamed from target/linux/patches/6.1.37/riscv32.patch)0
-rw-r--r--target/linux/patches/6.1.39/rockchip-115200.patch (renamed from target/linux/patches/6.1.37/rockchip-115200.patch)0
-rw-r--r--target/linux/patches/6.1.39/rockchip-pcie-timeout.patch (renamed from target/linux/patches/6.1.37/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 2e8862e7d..23a9af240 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.37
+KERNEL_FILE_VER:= 6.1.39
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 46cad712d261a23c8e483a3b79b6a84b9a5f731a8921c9127df35ae35cef1e80
+KERNEL_HASH:= 4cddee22fdf657138a06af653492f67cd3a4762c04a34725534bd200d99085b8
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y)
KERNEL_FILE_VER:= 5.15.120
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index e600b35cb..b4c9b808c 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.37"
+ bool "6.1.39"
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.37/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.39/board-rockpi4-0003-arm64-dts-pcie.patch
index 1777e7a86..1777e7a86 100644
--- a/target/linux/patches/6.1.37/board-rockpi4-0003-arm64-dts-pcie.patch
+++ b/target/linux/patches/6.1.39/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/target/linux/patches/6.1.37/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.39/enable-ethernet-bpi-m2-plus.patch
index 7e9abd9ce..7e9abd9ce 100644
--- a/target/linux/patches/6.1.37/enable-ethernet-bpi-m2-plus.patch
+++ b/target/linux/patches/6.1.39/enable-ethernet-bpi-m2-plus.patch
diff --git a/target/linux/patches/6.1.37/riscv32.patch b/target/linux/patches/6.1.39/riscv32.patch
index 648b0de4d..648b0de4d 100644
--- a/target/linux/patches/6.1.37/riscv32.patch
+++ b/target/linux/patches/6.1.39/riscv32.patch
diff --git a/target/linux/patches/6.1.37/rockchip-115200.patch b/target/linux/patches/6.1.39/rockchip-115200.patch
index ad8a2d7a7..ad8a2d7a7 100644
--- a/target/linux/patches/6.1.37/rockchip-115200.patch
+++ b/target/linux/patches/6.1.39/rockchip-115200.patch
diff --git a/target/linux/patches/6.1.37/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.39/rockchip-pcie-timeout.patch
index 2ef7df2da..2ef7df2da 100644
--- a/target/linux/patches/6.1.37/rockchip-pcie-timeout.patch
+++ b/target/linux/patches/6.1.39/rockchip-pcie-timeout.patch