summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@conet.de>2018-08-27 16:57:46 (GMT)
committerWaldemar Brodkorb <wbrodkorb@conet.de>2018-08-27 16:57:46 (GMT)
commit0048544c405c549f6ef1f656166b5fdd0baa00e2 (patch)
tree9491c82d7e76d9ab532a876871c3e97029d91c27
parent71bd053dc6b5677d8de0fab9d2f7e512a09e7ad6 (diff)
linux: update to 4.18.5
-rw-r--r--mk/linux-ver.mk12
-rw-r--r--target/linux/Config.in.kernelversion16
-rw-r--r--target/linux/patches/4.18.5/arc.patch (renamed from target/linux/patches/4.17.2/arc.patch)0
-rw-r--r--target/linux/patches/4.18.5/startup.patch (renamed from target/linux/patches/4.17.2/startup.patch)0
4 files changed, 6 insertions, 22 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 7d30e69..6c8d966 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -15,17 +15,11 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT)
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_17),y)
-KERNEL_FILE_VER:= 4.17.2
-KERNEL_RELEASE:= 1
-KERNEL_VERSION:= $(KERNEL_FILE_VER).0-$(KERNEL_RELEASE)
-KERNEL_HASH:= 4cebcd6f4ddc49e68543a6d920582d9e0eca431be89f9c1b85fd4ecf1dd87b9c
-endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_16),y)
-KERNEL_FILE_VER:= 4.16.17
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_18),y)
+KERNEL_FILE_VER:= 4.18.5
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= c93d8d0bab0807469a6720f279eff0a2c8bc02d94f3f1dafadbb5d9ebbbc028c
+KERNEL_HASH:= fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y)
KERNEL_FILE_VER:= 4.14.44
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index c81f507..baaafe7 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -16,7 +16,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_RISCV64
default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS
default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300
default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG
-default ADK_TARGET_LINUX_KERNEL_VERSION_4_17 if ADK_TARGET_ARCH_ARC
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_18 if ADK_TARGET_ARCH_ARC
default ADK_TARGET_LINUX_KERNEL_VERSION_4_14
config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
@@ -29,8 +29,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-config ADK_TARGET_LINUX_KERNEL_VERSION_4_17
- bool "4.17.2"
+config ADK_TARGET_LINUX_KERNEL_VERSION_4_18
+ bool "4.18.5"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CRIS
depends on !ADK_TARGET_ARCH_CSKY
@@ -38,16 +38,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_17
depends on !ADK_TARGET_ARCH_RISCV32
depends on !ADK_TARGET_ARCH_RISCV64
-config ADK_TARGET_LINUX_KERNEL_VERSION_4_16
- bool "4.16.17"
- depends on !ADK_TARGET_ARCH_AVR32
- depends on !ADK_TARGET_ARCH_CRIS
- depends on !ADK_TARGET_ARCH_CSKY
- depends on !ADK_TARGET_ARCH_METAG
- depends on !ADK_TARGET_ARCH_NDS32
- depends on !ADK_TARGET_ARCH_RISCV32
- depends on !ADK_TARGET_ARCH_RISCV64
-
config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
bool "4.14.44"
depends on !ADK_TARGET_ARCH_AVR32
diff --git a/target/linux/patches/4.17.2/arc.patch b/target/linux/patches/4.18.5/arc.patch
index 20810ce..20810ce 100644
--- a/target/linux/patches/4.17.2/arc.patch
+++ b/target/linux/patches/4.18.5/arc.patch
diff --git a/target/linux/patches/4.17.2/startup.patch b/target/linux/patches/4.18.5/startup.patch
index dd27de8..dd27de8 100644
--- a/target/linux/patches/4.17.2/startup.patch
+++ b/target/linux/patches/4.18.5/startup.patch