diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-05-08 12:03:07 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-05-08 12:03:07 +0200 |
| commit | b124f62e23c3dc35ed0a74e68c2c596b30ea3d7c (patch) | |
| tree | f8268577b93188f3686c592a995a991a5ee08f35 /target/linux | |
| parent | 1aeaae49903816d0ea382cf9fc3bcf85c0bfd53d (diff) | |
| parent | 4ba6f070e52f2e10d6ff79afa1ff7f3cea212ebf (diff) | |
| download | buildroot-novena-b124f62e23c3dc35ed0a74e68c2c596b30ea3d7c.tar.gz buildroot-novena-b124f62e23c3dc35ed0a74e68c2c596b30ea3d7c.zip | |
Merge branch 'master' of git://git.buildroot.net/~correa/git/buildroot into test
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/Config.in.advanced | 17 | ||||
| -rw-r--r-- | target/linux/Config.in.versions | 10 |
2 files changed, 16 insertions, 11 deletions
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced index c4118c05d..de54d0392 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_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 default $(BR2_KERNEL_LATEST_2_6_26) if BR2_LINUX_2_6_26 && BR2_KERNEL_ADD_LATEST_MINORPATCH @@ -127,8 +128,12 @@ choice Select the specific Linux version you want to use config BR2_LINUX_2_6_STABLE - bool "The latest stable Linux kernel (2.6.28.2)" + bool "The latest stable Linux kernel (2.6.29.2)" +config BR2_LINUX_2_6_29 + bool "Linux 2.6.29" + select BR2_KERNEL_BASE + config BR2_LINUX_2_6_28 bool "Linux 2.6.28" select BR2_KERNEL_BASE @@ -165,10 +170,6 @@ config BR2_LINUX_2_6_20 bool "Linux 2.6.20" select BR2_KERNEL_BASE -config BR2_LINUX_2_6_29 - bool "Linux 2.6.29" - select BR2_KERNEL_BASE - config BR2_LINUX26_CUSTOM bool "Linux <custom> version" @@ -177,19 +178,19 @@ endchoice if BR2_LINUX26_CUSTOM config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION string "Linux Tarball version" - default "2.6.28" + default "2.6.30" help Specify any .tar.bz2 file config BR2_CUSTOM_LINUX26_VERSION string "Linux Version" - default "2.6.29-rc2" + default "2.6.30" help Specify what the linux version will be called config BR2_CUSTOM_LINUX26_PATCH string "patch name" - default "patch-2.6.29-rc2.bz2" + default "patch-2.6.30-rc4.bz2" help Specify a patch to be downloaded diff --git a/target/linux/Config.in.versions b/target/linux/Config.in.versions index caacfae38..467f73cdf 100644 --- a/target/linux/Config.in.versions +++ b/target/linux/Config.in.versions @@ -5,13 +5,13 @@ config LINUX26_LATEST_RC_VERSION string - default "2.6.29-rc2" if BR2_KERNEL_ADD_LATEST_RC_PATCH + default "2.6.30-rc4" if BR2_KERNEL_ADD_LATEST_RC_PATCH help Not really available as of 20090103 config LINUX26_LATEST_GIT_VERSION string - default "2.6.29-rc2-git1" if BR2_KERNEL_ADD_LATEST_SNAPSHOT + default "2.6.30-rc4-git4" if BR2_KERNEL_ADD_LATEST_SNAPSHOT config LINUX26_LATEST_MM_VERSION string @@ -19,10 +19,14 @@ config LINUX26_LATEST_MM_VERSION config BR2_KERNEL_CURRENT_VERSION string - default "2.6.28.7" + default "2.6.29.2" help This is the latest stable kernel (including minor version) +config BR2_KERNEL_LATEST_2_6_29 + string + default "2" + config BR2_KERNEL_LATEST_2_6_28 string default "7" |