summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-08-25 11:40:44 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-08-25 11:40:44 +0200
commitfb9bdbb294428e20981dd99af44fc038e8fb9e09 (patch)
tree044e5cb5613e04a48956d53846545ca5edec928d
parentf6e522c3ff8e6dcfaf632356971ddd6de4ec6c97 (diff)
update 4.1.x to latest
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/arm/bcm28xx/patches/4.1.6/0001-xbian.patch (renamed from target/arm/bcm28xx/patches/4.1.3/0001-xbian.patch)0
-rw-r--r--target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch (renamed from target/arm/solidrun-imx6/patches/4.1.3/0001-xbian.patch)0
-rw-r--r--target/config/Config.in.kernelversion.choice6
-rw-r--r--target/config/Config.in.kernelversion.default2
-rw-r--r--target/linux/patches/4.1.6/cris-header.patch (renamed from target/linux/patches/4.1.3/cris-header.patch)0
-rw-r--r--target/linux/patches/4.1.6/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.1.3/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/4.1.6/startup.patch (renamed from target/linux/patches/4.1.3/startup.patch)0
8 files changed, 7 insertions, 7 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index cda9f1014..4f25f325b 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -15,11 +15,11 @@ KERNEL_FILE_VER:= $(ADK_KERNEL_HASH)
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
endif
-ifeq ($(ADK_KERNEL_VERSION_4_1_3),y)
-KERNEL_FILE_VER:= 4.1.3
+ifeq ($(ADK_KERNEL_VERSION_4_1_6),y)
+KERNEL_FILE_VER:= 4.1.6
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 96dd2c30984408a8a2211463618c3564514239f1e4335f6bc461c4b9a9bae30b
+KERNEL_HASH:= 912d6ec42dce8c1139ffee7523abb1a048fec1ae5b83a8f95d0ce6d34a3b99fe
endif
ifeq ($(ADK_KERNEL_VERSION_3_18_16),y)
KERNEL_FILE_VER:= 3.18.16
diff --git a/target/arm/bcm28xx/patches/4.1.3/0001-xbian.patch b/target/arm/bcm28xx/patches/4.1.6/0001-xbian.patch
index 318706994..318706994 100644
--- a/target/arm/bcm28xx/patches/4.1.3/0001-xbian.patch
+++ b/target/arm/bcm28xx/patches/4.1.6/0001-xbian.patch
diff --git a/target/arm/solidrun-imx6/patches/4.1.3/0001-xbian.patch b/target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch
index 6286c0868..6286c0868 100644
--- a/target/arm/solidrun-imx6/patches/4.1.3/0001-xbian.patch
+++ b/target/arm/solidrun-imx6/patches/4.1.6/0001-xbian.patch
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index 820cf5e63..db05d3217 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -4,13 +4,13 @@
choice
prompt "Kernel Version"
depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_4_1_3
+default ADK_KERNEL_VERSION_4_1_6
config ADK_KERNEL_VERSION_GIT
bool "linux-git"
-config ADK_KERNEL_VERSION_4_1_3
- bool "4.1.3"
+config ADK_KERNEL_VERSION_4_1_6
+ bool "4.1.6"
depends on !ADK_TARGET_ARCH_H8300
depends on !ADK_TARGET_SYSTEM_KINETIS_K70
select ADK_KERNEL_VERSION_4_1
diff --git a/target/config/Config.in.kernelversion.default b/target/config/Config.in.kernelversion.default
index ccf460120..a0edd5dbb 100644
--- a/target/config/Config.in.kernelversion.default
+++ b/target/config/Config.in.kernelversion.default
@@ -27,7 +27,7 @@ config ADK_KERNEL_VERSION_2_6_32
config ADK_KERNEL_VERSION
string
- default "4.1.3" if ADK_KERNEL_VERSION_4_1_3
+ default "4.1.6" if ADK_KERNEL_VERSION_4_1_6
default "3.18.16" if ADK_KERNEL_VERSION_3_18_16
default "3.14.45" if ADK_KERNEL_VERSION_3_14_45
default "3.12.44" if ADK_KERNEL_VERSION_3_12_44
diff --git a/target/linux/patches/4.1.3/cris-header.patch b/target/linux/patches/4.1.6/cris-header.patch
index 2b5a88461..2b5a88461 100644
--- a/target/linux/patches/4.1.3/cris-header.patch
+++ b/target/linux/patches/4.1.6/cris-header.patch
diff --git a/target/linux/patches/4.1.3/initramfs-nosizelimit.patch b/target/linux/patches/4.1.6/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.1.3/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.1.6/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.1.3/startup.patch b/target/linux/patches/4.1.6/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/4.1.3/startup.patch
+++ b/target/linux/patches/4.1.6/startup.patch