summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-06-04 23:51:49 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-06-04 23:52:04 +0200
commitf02949508538699f141ce02d18225802d1bea754 (patch)
treefd2bc46df9d091591b461cbe00e1c1c516a0bcb8
parentdced56cd5ba2740241aff8b89c03f47e3dd72bd6 (diff)
kernel: update to latest 4.6.x
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/config/Config.in.kernelversion8
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index df54dbfd3..2950203ac 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -19,11 +19,11 @@ endif
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6_0),y)
-KERNEL_FILE_VER:= 4.6
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6_1),y)
+KERNEL_FILE_VER:= 4.6.1
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866
+KERNEL_HASH:= d5ddf444f8690294bede8840aa6689f7e6c95833f6b42cfc501309da22bf7b1c
endif
ifeq ($(ADK_TARGET_KERNEL_VERSION_4_5_4),y)
KERNEL_FILE_VER:= 4.5.4
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index f51da0949..aa8c5f228 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -4,15 +4,15 @@
choice
prompt "Kernel version" if !ADK_TARGET_CHOOSE_ARCH
depends on ADK_TARGET_OS_LINUX
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA
-default ADK_TARGET_KERNEL_VERSION_4_6_0 if ADK_TARGET_ARCH_ARC
+default ADK_TARGET_KERNEL_VERSION_4_6_1 if ADK_TARGET_ARCH_ARC
+default ADK_TARGET_KERNEL_VERSION_4_6_1 if ADK_TARGET_ARCH_XTENSA && ADK_TARGET_WITHOUT_MMU
default ADK_TARGET_KERNEL_VERSION_4_4_10
config ADK_TARGET_KERNEL_VERSION_GIT
bool "linux-git"
-config ADK_TARGET_KERNEL_VERSION_4_6_0
- bool "4.6"
+config ADK_TARGET_KERNEL_VERSION_4_6_1
+ bool "4.6.1"
depends on !ADK_TARGET_BOARD_BCM28XX
select ADK_TARGET_KERNEL_VERSION_4_6