diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /boot | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/barebox/Config.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 8dfaeb2d4..0342a33b1 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -8,20 +8,20 @@ config BR2_TARGET_BAREBOX if BR2_TARGET_BAREBOX choice prompt "version" - default BR2_TARGET_BAREBOX_2011_10 + default BR2_TARGET_BAREBOX_2011_11 help Select the specific Barebox version you want to use -config BR2_TARGET_BAREBOX_2011_08 - depends on BR2_DEPRECATED - bool "2011.08" - config BR2_TARGET_BAREBOX_2011_09 + depends on BR2_DEPRECATED bool "2011.09" config BR2_TARGET_BAREBOX_2011_10 bool "2011.10" +config BR2_TARGET_BAREBOX_2011_11 + bool "2011.11" + config BR2_TARGET_BAREBOX_CUSTOM_TARBALL bool "Custom tarball" @@ -39,9 +39,9 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2011.08.0" if BR2_TARGET_BAREBOX_2011_08 default "2011.09.0" if BR2_TARGET_BAREBOX_2011_09 default "2011.10.0" if BR2_TARGET_BAREBOX_2011_10 + default "2011.11.0" if BR2_TARGET_BAREBOX_2011_11 default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT |