use 4.17.1 for ARC architecture

10 files changed, 23 insertions, 6 deletions

diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 7227586d9..df30a0e40 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -16,16 +16,16 @@ 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
+KERNEL_FILE_VER:=	4.17.1
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER).0-$(KERNEL_RELEASE)
-KERNEL_HASH:=		9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13
+KERNEL_HASH:=		c93f3fbcbce66b7ed51e1d33d669b0ad56dd5088c23ea77fb8925b328faa7070
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_16),y)
-KERNEL_FILE_VER:=	4.16.12
+KERNEL_FILE_VER:=	4.16.15
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		567078358d5a3490d1410696f36f36f5e88f98bef9f4d3c0d68c605aeb71111d
+KERNEL_HASH:=		58f2a6732d240a45322495d4839a80c8049eac7caa1f4f44860565665579236c
 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 84fe1ce74..d3694bd2f 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -16,6 +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_14
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
@@ -29,7 +30,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_4_17
-	bool "4.17.0"
+	bool "4.17.1"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
@@ -38,7 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_17
 	depends on !ADK_TARGET_ARCH_RISCV64
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_16
-	bool "4.16.12"
+	bool "4.16.15"
+	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
@@ -49,6 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_16
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
 	bool "4.14.44"
+	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
@@ -59,6 +62,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_9
 	bool "4.9.103"
+	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_METAG
@@ -70,6 +74,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_9
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_4
 	bool "4.4.132"
+	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_NIOS2
diff --git a/target/linux/patches/4.16.12/arc.patch b/target/linux/patches/4.16.15/arc.patch
index a2dd8b327..a2dd8b327 100644
--- a/target/linux/patches/4.16.12/arc.patch
+++ b/target/linux/patches/4.16.15/arc.patch
diff --git a/target/linux/patches/4.16.12/arm-nommu.patch b/target/linux/patches/4.16.15/arm-nommu.patch
index 2480b5169..2480b5169 100644
--- a/target/linux/patches/4.16.12/arm-nommu.patch
+++ b/target/linux/patches/4.16.15/arm-nommu.patch
diff --git a/target/linux/patches/4.16.12/arm-thumb2.patch b/target/linux/patches/4.16.15/arm-thumb2.patch
index a5ae3d260..a5ae3d260 100644
--- a/target/linux/patches/4.16.12/arm-thumb2.patch
+++ b/target/linux/patches/4.16.15/arm-thumb2.patch
diff --git a/target/linux/patches/4.16.12/h8300.patch b/target/linux/patches/4.16.15/h8300.patch
index 836a414e5..836a414e5 100644
--- a/target/linux/patches/4.16.12/h8300.patch
+++ b/target/linux/patches/4.16.15/h8300.patch
diff --git a/target/linux/patches/4.16.12/or1k-more-ram.patch b/target/linux/patches/4.16.15/or1k-more-ram.patch
index de848c838..de848c838 100644
--- a/target/linux/patches/4.16.12/or1k-more-ram.patch
+++ b/target/linux/patches/4.16.15/or1k-more-ram.patch
diff --git a/target/linux/patches/4.16.12/startup.patch b/target/linux/patches/4.16.15/startup.patch
index 8115b2cc6..8115b2cc6 100644
--- a/target/linux/patches/4.16.12/startup.patch
+++ b/target/linux/patches/4.16.15/startup.patch
diff --git a/target/linux/patches/4.17.1/arc.patch b/target/linux/patches/4.17.1/arc.patch
new file mode 100644
index 000000000..20810ce64
--- /dev/null
+++ b/target/linux/patches/4.17.1/arc.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile
+--- linux-4.17.1.orig/arch/arc/boot/Makefile	2018-06-11 22:43:19.000000000 +0200
++++ linux-4.17.1/arch/arc/boot/Makefile	2018-06-16 18:28:02.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S
+ 
+-LINUX_START_TEXT = $$(readelf -h vmlinux | \
++LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \
+ 			grep "Entry point address" | grep -o 0x.*)
+ 
+ UIMAGE_LOADADDR    = $(CONFIG_LINUX_LINK_BASE)
diff --git a/target/linux/patches/4.17/startup.patch b/target/linux/patches/4.17.1/startup.patch
index dd27de856..dd27de856 100644
--- a/target/linux/patches/4.17/startup.patch
+++ b/target/linux/patches/4.17.1/startup.patch