diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-17 16:58:48 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-17 16:58:48 +0200 |
commit | 151f8bc05206f4e3f3641c2dd28970642d00cde5 (patch) | |
tree | 050c80b746e35a8f2e6da6b2afbbf01e91112361 | |
parent | 2d894ddb836cc4cf9d6a4b7f6fa44378dc7c1a16 (diff) | |
parent | 44e4ea701b6b4493e046538689453a393d6db92b (diff) | |
download | embtoolkit-151f8bc05206f4e3f3641c2dd28970642d00cde5.tar.gz embtoolkit-151f8bc05206f4e3f3641c2dd28970642d00cde5.tar.bz2 embtoolkit-151f8bc05206f4e3f3641c2dd28970642d00cde5.tar.xz |
Merge branch 'master' into embtk-0.1.0-rc14-dev
-rw-r--r-- | kconfig/linux-kconfigs/linux-2.6.32.kconfig | 4 | ||||
-rw-r--r-- | kconfig/linux-kconfigs/linux-2.6.33.kconfig | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/kconfig/linux-kconfigs/linux-2.6.32.kconfig b/kconfig/linux-kconfigs/linux-2.6.32.kconfig index 2e072ac..4669db8 100644 --- a/kconfig/linux-kconfigs/linux-2.6.32.kconfig +++ b/kconfig/linux-kconfigs/linux-2.6.32.kconfig @@ -28,6 +28,8 @@ choice help Linux v2.6.32.x series exact version to use. + config EMBTK_LINUX_VERSION_2_6_32_43 + bool "linux-2.6.32.43" config EMBTK_LINUX_VERSION_2_6_32_42 bool "linux-2.6.32.42" config EMBTK_LINUX_VERSION_2_6_32_41 @@ -118,6 +120,7 @@ endchoice config EMBTK_LINUX_LONGTERM_VERSION_STRING string + default "v2.6.32" if EMBTK_LINUX_VERSION_2_6_32_43 default "v2.6.32" if EMBTK_LINUX_VERSION_2_6_32_42 default "v2.6.32" if EMBTK_LINUX_VERSION_2_6_32_41 default "v2.6.32" if EMBTK_LINUX_VERSION_2_6_32_40 @@ -136,6 +139,7 @@ config EMBTK_LINUX_LONGTERM_VERSION_STRING config EMBTK_LINUX_VERSION_STRING string + default "2.6.32.43" if EMBTK_LINUX_VERSION_2_6_32_43 default "2.6.32.42" if EMBTK_LINUX_VERSION_2_6_32_42 default "2.6.32.41" if EMBTK_LINUX_VERSION_2_6_32_41 default "2.6.32.40" if EMBTK_LINUX_VERSION_2_6_32_40 diff --git a/kconfig/linux-kconfigs/linux-2.6.33.kconfig b/kconfig/linux-kconfigs/linux-2.6.33.kconfig index a28183f..7b7a052 100644 --- a/kconfig/linux-kconfigs/linux-2.6.33.kconfig +++ b/kconfig/linux-kconfigs/linux-2.6.33.kconfig @@ -28,6 +28,8 @@ choice help Linux v2.6.33.x series exact version to use. + config EMBTK_LINUX_VERSION_2_6_33_16 + bool "linux-2.6.33.16" config EMBTK_LINUX_VERSION_2_6_33_15 bool "linux-2.6.33.15" config EMBTK_LINUX_VERSION_2_6_33_14 @@ -64,6 +66,7 @@ endchoice config EMBTK_LINUX_LONGTERM_VERSION_STRING string + default "v2.6.33" if EMBTK_LINUX_VERSION_2_6_33_16 default "v2.6.33" if EMBTK_LINUX_VERSION_2_6_33_15 default "v2.6.33" if EMBTK_LINUX_VERSION_2_6_33_14 default "v2.6.33" if EMBTK_LINUX_VERSION_2_6_33_13 @@ -75,6 +78,7 @@ config EMBTK_LINUX_LONGTERM_VERSION_STRING config EMBTK_LINUX_VERSION_STRING string + default "2.6.33.16" if EMBTK_LINUX_VERSION_2_6_33_16 default "2.6.33.15" if EMBTK_LINUX_VERSION_2_6_33_15 default "2.6.33.14" if EMBTK_LINUX_VERSION_2_6_33_14 default "2.6.33.13" if EMBTK_LINUX_VERSION_2_6_33_13 |