summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2020-05-27 04:59:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2020-05-27 04:59:49 (GMT)
commit0286cdc8007636a9f1d46fa7518962131ee96360 (patch)
tree73953323ee3098aca961b416c2caa2b688252a7b
parent610e864ad0cb3c6262d02cc9a0baf33e0b56071c (diff)
linux: update to 5.4.42
-rw-r--r--mk/linux-ver.mk4
-rw-r--r--target/linux/Config.in.kernelversion2
-rw-r--r--target/linux/patches/5.4.42/or1k-more-ram.patch (renamed from target/linux/patches/5.4.18/or1k-more-ram.patch)0
3 files changed, 3 insertions, 3 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 9815e5a..b891837 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_5_4),y)
-KERNEL_FILE_VER:= 5.4.18
+KERNEL_FILE_VER:= 5.4.42
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 92e9f1fd69543e9ce2a9e6eb918823b1846d2dd99246a74456263cd5ad234d89
+KERNEL_HASH:= 4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y)
KERNEL_FILE_VER:= 4.19.99
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index b67ec66..673b459 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -40,7 +40,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_5_4
- bool "5.4.18"
+ bool "5.4.42"
select ADK_TARGET_LINUX_KERNEL_NEW
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_BFIN
diff --git a/target/linux/patches/5.4.18/or1k-more-ram.patch b/target/linux/patches/5.4.42/or1k-more-ram.patch
index de848c8..de848c8 100644
--- a/target/linux/patches/5.4.18/or1k-more-ram.patch
+++ b/target/linux/patches/5.4.42/or1k-more-ram.patch