summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in13
-rw-r--r--mk/kernel-ver.mk16
-rw-r--r--target/linux/config/Config.in.netfilter.ip44
-rw-r--r--target/linux/patches/3.9.11/bsd-compatibility.patch (renamed from target/linux/patches/3.9.9/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.9.11/cris-etrax.patch (renamed from target/linux/patches/3.9.9/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.9.11/defaults.patch (renamed from target/linux/patches/3.9.9/defaults.patch)0
-rw-r--r--target/linux/patches/3.9.11/disable-netfilter.patch (renamed from target/linux/patches/3.9.9/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.9.11/gemalto.patch (renamed from target/linux/patches/3.9.9/gemalto.patch)0
-rw-r--r--target/linux/patches/3.9.11/lemote-rfkill.patch (renamed from target/linux/patches/3.9.9/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.9.11/mtd-rootfs.patch (renamed from target/linux/patches/3.9.9/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.9.11/non-static.patch (renamed from target/linux/patches/3.9.9/non-static.patch)0
-rw-r--r--target/linux/patches/3.9.11/raspberry.patch (renamed from target/linux/patches/3.9.9/raspberry.patch)0
-rw-r--r--target/linux/patches/3.9.11/startup.patch (renamed from target/linux/patches/3.9.9/startup.patch)0
-rw-r--r--target/linux/patches/3.9.11/usb-defaults-off.patch (renamed from target/linux/patches/3.9.9/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.9.11/uuid.patch (renamed from target/linux/patches/3.9.9/uuid.patch)0
-rw-r--r--target/linux/patches/3.9.11/vga-cons-default-off.patch (renamed from target/linux/patches/3.9.9/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.9.11/wlan-cf.patch (renamed from target/linux/patches/3.9.9/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.9.11/zlib-inflate.patch (renamed from target/linux/patches/3.9.9/zlib-inflate.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.9.9/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/headersinst-xargs.patch (renamed from toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/microperl.patch (renamed from toolchain/kernel-headers/patches/3.9.9/microperl.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.9.9/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/relocs.patch (renamed from toolchain/kernel-headers/patches/3.9.9/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/sortext.patch (renamed from toolchain/kernel-headers/patches/3.9.9/sortext.patch)0
24 files changed, 11 insertions, 22 deletions
diff --git a/Config.in b/Config.in
index 5bab74686..d2bedf377 100644
--- a/Config.in
+++ b/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
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 7e7fc8724..29caeae76 100644
--- a/mk/kernel-ver.mk
+++ b/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
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index cb3f8e1cb..f8394ddd7 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/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
diff --git a/target/linux/patches/3.9.9/bsd-compatibility.patch b/target/linux/patches/3.9.11/bsd-compatibility.patch
index 9e55150cc..9e55150cc 100644
--- a/target/linux/patches/3.9.9/bsd-compatibility.patch
+++ b/target/linux/patches/3.9.11/bsd-compatibility.patch
diff --git a/target/linux/patches/3.9.9/cris-etrax.patch b/target/linux/patches/3.9.11/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.9.9/cris-etrax.patch
+++ b/target/linux/patches/3.9.11/cris-etrax.patch
diff --git a/target/linux/patches/3.9.9/defaults.patch b/target/linux/patches/3.9.11/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.9.9/defaults.patch
+++ b/target/linux/patches/3.9.11/defaults.patch
diff --git a/target/linux/patches/3.9.9/disable-netfilter.patch b/target/linux/patches/3.9.11/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.9.9/disable-netfilter.patch
+++ b/target/linux/patches/3.9.11/disable-netfilter.patch
diff --git a/target/linux/patches/3.9.9/gemalto.patch b/target/linux/patches/3.9.11/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.9.9/gemalto.patch
+++ b/target/linux/patches/3.9.11/gemalto.patch
diff --git a/target/linux/patches/3.9.9/lemote-rfkill.patch b/target/linux/patches/3.9.11/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.9.9/lemote-rfkill.patch
+++ b/target/linux/patches/3.9.11/lemote-rfkill.patch
diff --git a/target/linux/patches/3.9.9/mtd-rootfs.patch b/target/linux/patches/3.9.11/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.9.9/mtd-rootfs.patch
+++ b/target/linux/patches/3.9.11/mtd-rootfs.patch
diff --git a/target/linux/patches/3.9.9/non-static.patch b/target/linux/patches/3.9.11/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.9.9/non-static.patch
+++ b/target/linux/patches/3.9.11/non-static.patch
diff --git a/target/linux/patches/3.9.9/raspberry.patch b/target/linux/patches/3.9.11/raspberry.patch
index 694eb7414..694eb7414 100644
--- a/target/linux/patches/3.9.9/raspberry.patch
+++ b/target/linux/patches/3.9.11/raspberry.patch
diff --git a/target/linux/patches/3.9.9/startup.patch b/target/linux/patches/3.9.11/startup.patch
index d23d6d212..d23d6d212 100644
--- a/target/linux/patches/3.9.9/startup.patch
+++ b/target/linux/patches/3.9.11/startup.patch
diff --git a/target/linux/patches/3.9.9/usb-defaults-off.patch b/target/linux/patches/3.9.11/usb-defaults-off.patch
index 54dff2bd4..54dff2bd4 100644
--- a/target/linux/patches/3.9.9/usb-defaults-off.patch
+++ b/target/linux/patches/3.9.11/usb-defaults-off.patch
diff --git a/target/linux/patches/3.9.9/uuid.patch b/target/linux/patches/3.9.11/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.9.9/uuid.patch
+++ b/target/linux/patches/3.9.11/uuid.patch
diff --git a/target/linux/patches/3.9.9/vga-cons-default-off.patch b/target/linux/patches/3.9.11/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.9.9/vga-cons-default-off.patch
+++ b/target/linux/patches/3.9.11/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.9.9/wlan-cf.patch b/target/linux/patches/3.9.11/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.9.9/wlan-cf.patch
+++ b/target/linux/patches/3.9.11/wlan-cf.patch
diff --git a/target/linux/patches/3.9.9/zlib-inflate.patch b/target/linux/patches/3.9.11/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.9.9/zlib-inflate.patch
+++ b/target/linux/patches/3.9.11/zlib-inflate.patch
diff --git a/toolchain/kernel-headers/patches/3.9.9/cleankernel.patch b/toolchain/kernel-headers/patches/3.9.11/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.9.9/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.9.11/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch b/toolchain/kernel-headers/patches/3.9.11/headersinst-xargs.patch
index 62222b21b..62222b21b 100644
--- a/toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch
+++ b/toolchain/kernel-headers/patches/3.9.11/headersinst-xargs.patch
diff --git a/toolchain/kernel-headers/patches/3.9.9/microperl.patch b/toolchain/kernel-headers/patches/3.9.11/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.9.9/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.9.11/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.9.9/mkpiggy.patch b/toolchain/kernel-headers/patches/3.9.11/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.9.9/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.9.11/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.9.9/relocs.patch b/toolchain/kernel-headers/patches/3.9.11/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.9.9/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.9.11/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.9.9/sortext.patch b/toolchain/kernel-headers/patches/3.9.11/sortext.patch
index d82b76a2d..d82b76a2d 100644
--- a/toolchain/kernel-headers/patches/3.9.9/sortext.patch
+++ b/toolchain/kernel-headers/patches/3.9.11/sortext.patch