Browse Source

linux: update to 4.18.5

Waldemar Brodkorb 5 years ago
parent
commit
0048544c40

+ 3 - 9
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

+ 3 - 13
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

+ 0 - 0
target/linux/patches/4.17.2/arc.patch → target/linux/patches/4.18.5/arc.patch


+ 0 - 0
target/linux/patches/4.17.2/startup.patch → target/linux/patches/4.18.5/startup.patch