From 0286cdc8007636a9f1d46fa7518962131ee96360 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 27 May 2020 06:59:49 +0200 Subject: linux: update to 5.4.42 --- mk/linux-ver.mk | 4 ++-- target/linux/Config.in.kernelversion | 2 +- target/linux/patches/5.4.18/or1k-more-ram.patch | 12 ------------ target/linux/patches/5.4.42/or1k-more-ram.patch | 12 ++++++++++++ 4 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 target/linux/patches/5.4.18/or1k-more-ram.patch create mode 100644 target/linux/patches/5.4.42/or1k-more-ram.patch diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 9815e5ab2..b8918370b 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 b67ec6612..673b4592c 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.18/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/5.4.18/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/5.4.42/or1k-more-ram.patch b/target/linux/patches/5.4.42/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/5.4.42/or1k-more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts +--- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 ++++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { -- cgit v1.2.3