summaryrefslogtreecommitdiffstats
path: root/target/linux/Config.in.advanced
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 08:46:45 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 08:46:45 +0200
commit8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (patch)
tree0c9d4804dff797341734dd770e07521e5258b10f /target/linux/Config.in.advanced
parent8cf20245a169b9628d986e84761c4f2ee6ae43ce (diff)
parent1a6f22d2a3616e649c8241a3efc5b09aaa0fb849 (diff)
downloadbuildroot-novena-8c1fc169ab7330ddaed774d1e780b9d81edb4f25.tar.gz
buildroot-novena-8c1fc169ab7330ddaed774d1e780b9d81edb4f25.zip
Merge branch 'master' of git://git.buildroot.net/~ulf/git/linux
Diffstat (limited to 'target/linux/Config.in.advanced')
-rw-r--r--target/linux/Config.in.advanced21
1 files changed, 17 insertions, 4 deletions
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index 3a171b560..6d755d889 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -33,6 +33,7 @@ source "target/linux/Config.in.versions"
config BR2_KERNEL_PATCH_LEVEL
string
+ default $(BR2_KERNEL_LATEST_2_6_30) if BR2_LINUX_2_6_30 && BR2_KERNEL_ADD_LATEST_MINORPATCH
default $(BR2_KERNEL_LATEST_2_6_29) if BR2_LINUX_2_6_29 && BR2_KERNEL_ADD_LATEST_MINORPATCH
default $(BR2_KERNEL_LATEST_2_6_28) if BR2_LINUX_2_6_28 && BR2_KERNEL_ADD_LATEST_MINORPATCH
default $(BR2_KERNEL_LATEST_2_6_27) if BR2_LINUX_2_6_27 && BR2_KERNEL_ADD_LATEST_MINORPATCH
@@ -47,6 +48,8 @@ config BR2_KERNEL_PATCH_LEVEL
config BR2_KERNEL_NEXT_VERSION
string
+ default "2.6.31" if BR2_LINUX_2_6_30
+ default "2.6.30" if BR2_LINUX_2_6_29
default "2.6.29" if BR2_LINUX_2_6_28
default "2.6.28" if BR2_LINUX_2_6_27
default "2.6.27" if BR2_LINUX_2_6_26
@@ -59,6 +62,8 @@ config BR2_KERNEL_NEXT_VERSION
config BR2_KERNEL_THIS_VERSION
string
+ default "2.6.31" if BR2_LINUX_2_6_31
+ default "2.6.30" if BR2_LINUX_2_6_30
default "2.6.29" if BR2_LINUX_2_6_29
default "2.6.28" if BR2_LINUX_2_6_28
default "2.6.27" if BR2_LINUX_2_6_27
@@ -128,7 +133,11 @@ choice
Select the specific Linux version you want to use
config BR2_LINUX_2_6_STABLE
- bool "The latest stable Linux kernel (2.6.29.4)"
+ bool "The latest stable Linux kernel (2.6.30.2)"
+
+config BR2_LINUX_2_6_30
+ bool "Linux 2.6.30"
+ select BR2_KERNEL_BASE
config BR2_LINUX_2_6_29
bool "Linux 2.6.29"
@@ -170,6 +179,10 @@ config BR2_LINUX_2_6_20
bool "Linux 2.6.20"
select BR2_KERNEL_BASE
+config BR2_LINUX_2_6_31
+ bool "Linux 2.6.31"
+ select BR2_KERNEL_BASE
+
config BR2_LINUX26_CUSTOM
bool "Linux <custom> version"
@@ -178,19 +191,19 @@ endchoice
if BR2_LINUX26_CUSTOM
config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION
string "Linux Tarball version"
- default "2.6.30"
+ default "2.6.31"
help
Specify any .tar.bz2 file
config BR2_CUSTOM_LINUX26_VERSION
string "Linux Version"
- default "2.6.30"
+ default "2.6.31"
help
Specify what the linux version will be called
config BR2_CUSTOM_LINUX26_PATCH
string "patch name"
- default "patch-2.6.30-rc4.bz2"
+ default "patch-2.6.31-rc4.bz2"
help
Specify a patch to be downloaded