summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-11-13 06:41:22 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-11-13 06:41:39 +0100
commit0850444b51daf31a6e1963eb9613abb2c9de0e3d (patch)
tree8c2acd6a5c8295dc2cd8c0aa13523d40e4d98fd5
parent500356799b7181529042c75a510a69effa967aa6 (diff)
bump Linux 4.2.x kernel
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/config/Config.in.kernelversion10
-rw-r--r--target/linux/patches/4.2.6/cris-header.patch (renamed from target/linux/patches/4.2.5/cris-header.patch)0
-rw-r--r--target/linux/patches/4.2.6/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.2.5/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/4.2.6/regmap-default-on.patch (renamed from target/linux/patches/4.2.5/regmap-default-on.patch)0
-rw-r--r--target/linux/patches/4.2.6/startup.patch (renamed from target/linux/patches/4.2.5/startup.patch)0
6 files changed, 8 insertions, 8 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 05b0b6cff..53a695832 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -21,11 +21,11 @@ KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
KERNEL_HASH:= 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae
endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_2_5),y)
-KERNEL_FILE_VER:= 4.2.5
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_2_6),y)
+KERNEL_FILE_VER:= 4.2.6
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 7c43bb038ddf7396b998fb802b1453f68035cba2dcadeb507f54520bbe533187
+KERNEL_HASH:= 17db6b7dc0061135df39b376e325d01152df4087253e9563e1c7ceb4c736fb5c
endif
ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1_10),y)
KERNEL_FILE_VER:= 4.1.10
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 5888aa34d..24fffa23e 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -4,9 +4,9 @@
choice
prompt "Kernel Version"
depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_TARGET_KERNEL_VERSION_4_2_5 if ADK_TARGET_ARCH_ARC
-default ADK_TARGET_KERNEL_VERSION_4_2_5 if ADK_TARGET_ARCH_H8300
-default ADK_TARGET_KERNEL_VERSION_4_2_5 if ADK_TARGET_ARCH_SPARC
+default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_ARC
+default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_H8300
+default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_SPARC
default ADK_TARGET_KERNEL_VERSION_4_1_10
config ADK_TARGET_KERNEL_VERSION_GIT
@@ -16,8 +16,8 @@ config ADK_TARGET_KERNEL_VERSION_4_3_0
bool "4.3"
select ADK_TARGET_KERNEL_VERSION_4_3
-config ADK_TARGET_KERNEL_VERSION_4_2_5
- bool "4.2.5"
+config ADK_TARGET_KERNEL_VERSION_4_2_6
+ bool "4.2.6"
select ADK_TARGET_KERNEL_VERSION_4_2
config ADK_TARGET_KERNEL_VERSION_4_1_10
diff --git a/target/linux/patches/4.2.5/cris-header.patch b/target/linux/patches/4.2.6/cris-header.patch
index 2b5a88461..2b5a88461 100644
--- a/target/linux/patches/4.2.5/cris-header.patch
+++ b/target/linux/patches/4.2.6/cris-header.patch
diff --git a/target/linux/patches/4.2.5/initramfs-nosizelimit.patch b/target/linux/patches/4.2.6/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.2.5/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.2.6/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.2.5/regmap-default-on.patch b/target/linux/patches/4.2.6/regmap-default-on.patch
index 8d72224bf..8d72224bf 100644
--- a/target/linux/patches/4.2.5/regmap-default-on.patch
+++ b/target/linux/patches/4.2.6/regmap-default-on.patch
diff --git a/target/linux/patches/4.2.5/startup.patch b/target/linux/patches/4.2.6/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/4.2.5/startup.patch
+++ b/target/linux/patches/4.2.6/startup.patch