Browse Source

update stable kernel

Waldemar Brodkorb 10 years ago
parent
commit
c2364f13f2

+ 4 - 9
Config.in

@@ -95,7 +95,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.9.9"
+	prompt "3.9.11"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -106,12 +106,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_9_9
-	prompt "3.9.9"
-	boolean
-
-config ADK_KERNEL_VERSION_3_6_11
-	prompt "3.6.11"
+config ADK_KERNEL_VERSION_3_9_11
+	prompt "3.9.11"
 	boolean
 
 config ADK_KERNEL_VERSION_3_4_60
@@ -122,8 +118,7 @@ endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.9.9" if ADK_KERNEL_VERSION_3_9_9
-	default "3.6.11" if ADK_KERNEL_VERSION_3_6_11
+	default "3.9.11" if ADK_KERNEL_VERSION_3_9_11
 	default "3.4.60" if ADK_KERNEL_VERSION_3_4_60
 	help
 

+ 5 - 11
mk/kernel-ver.mk

@@ -1,20 +1,14 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.9.9
+KERNEL_VERSION:=	3.9.11
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		70504d1685140e3ee355b9f860284d85
+KERNEL_MD5SUM:=		edbf88eb7f7d34dbd5d3887726790755
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_9_9),y)
-KERNEL_VERSION:=	3.9.9
+ifeq ($(ADK_KERNEL_VERSION_3_9_11),y)
+KERNEL_VERSION:=	3.9.11
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		70504d1685140e3ee355b9f860284d85
-endif
-ifeq ($(ADK_KERNEL_VERSION_3_6_11),y)
-KERNEL_VERSION:=	3.6.11
-KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
-KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		3d602ad7f7984509c3e923a5ae90bc54
+KERNEL_MD5SUM:=		edbf88eb7f7d34dbd5d3887726790755
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_4_60),y)
 KERNEL_VERSION:=	3.4.60

+ 2 - 2
target/linux/config/Config.in.netfilter.ip4

@@ -37,7 +37,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
 	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_60
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_9
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
@@ -51,7 +51,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_9_9
+	depends on ADK_KERNEL_VERSION_3_9_11
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by

+ 0 - 0
target/linux/patches/3.9.9/bsd-compatibility.patch → target/linux/patches/3.9.11/bsd-compatibility.patch


+ 0 - 0
target/linux/patches/3.9.9/cris-etrax.patch → target/linux/patches/3.9.11/cris-etrax.patch


+ 0 - 0
target/linux/patches/3.9.9/defaults.patch → target/linux/patches/3.9.11/defaults.patch


+ 0 - 0
target/linux/patches/3.9.9/disable-netfilter.patch → target/linux/patches/3.9.11/disable-netfilter.patch


+ 0 - 0
target/linux/patches/3.9.9/gemalto.patch → target/linux/patches/3.9.11/gemalto.patch


+ 0 - 0
target/linux/patches/3.9.9/lemote-rfkill.patch → target/linux/patches/3.9.11/lemote-rfkill.patch


+ 0 - 0
target/linux/patches/3.9.9/mtd-rootfs.patch → target/linux/patches/3.9.11/mtd-rootfs.patch


+ 0 - 0
target/linux/patches/3.9.9/non-static.patch → target/linux/patches/3.9.11/non-static.patch


+ 0 - 0
target/linux/patches/3.9.9/raspberry.patch → target/linux/patches/3.9.11/raspberry.patch


+ 0 - 0
target/linux/patches/3.9.9/startup.patch → target/linux/patches/3.9.11/startup.patch


+ 0 - 0
target/linux/patches/3.9.9/usb-defaults-off.patch → target/linux/patches/3.9.11/usb-defaults-off.patch


+ 0 - 0
target/linux/patches/3.9.9/uuid.patch → target/linux/patches/3.9.11/uuid.patch


+ 0 - 0
target/linux/patches/3.9.9/vga-cons-default-off.patch → target/linux/patches/3.9.11/vga-cons-default-off.patch


+ 0 - 0
target/linux/patches/3.9.9/wlan-cf.patch → target/linux/patches/3.9.11/wlan-cf.patch


+ 0 - 0
target/linux/patches/3.9.9/zlib-inflate.patch → target/linux/patches/3.9.11/zlib-inflate.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.9.9/cleankernel.patch → toolchain/kernel-headers/patches/3.9.11/cleankernel.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch → toolchain/kernel-headers/patches/3.9.11/headersinst-xargs.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.9.9/microperl.patch → toolchain/kernel-headers/patches/3.9.11/microperl.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.9.9/mkpiggy.patch → toolchain/kernel-headers/patches/3.9.11/mkpiggy.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.9.9/relocs.patch → toolchain/kernel-headers/patches/3.9.11/relocs.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.9.9/sortext.patch → toolchain/kernel-headers/patches/3.9.11/sortext.patch