浏览代码

u-boot: add 2012.10, deprecate 2011.09, remove 2011.03

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 12 年之前
父节点
当前提交
501ba89958
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      boot/uboot/Config.in

+ 6 - 6
boot/uboot/Config.in

@@ -14,10 +14,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2012_07
+	default BR2_TARGET_UBOOT_2012_10
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2012_10
+	bool "2012.10"
+
 config BR2_TARGET_UBOOT_2012_07
 	bool "2012.07"
 
@@ -29,15 +32,12 @@ config BR2_TARGET_UBOOT_2011_12
 
 config BR2_TARGET_UBOOT_2011_09
 	bool "2011.09"
+	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_2011_06
 	bool "2011.06"
 	depends on BR2_DEPRECATED
 
-config BR2_TARGET_UBOOT_2011_03
-	bool "2011.03"
-	depends on BR2_DEPRECATED
-
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -55,12 +55,12 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2012.10"	if BR2_TARGET_UBOOT_2012_10
 	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
-	default "2011.03"	if BR2_TARGET_UBOOT_2011_03
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT