diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2011-07-11 22:46:17 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-11 23:44:14 +0200 |
| commit | e488c285b1839976e1d508d8be8c0208cc453f3e (patch) | |
| tree | 4e2cda31810fa35df4e0b13283771de3d156ee21 /boot | |
| parent | f45f775b4fcb271e5b94b489ad47ffd37f712ce2 (diff) | |
uboot: Add 2011.06, remove 2010.03
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/uboot/Config.in | 10 | ||||
| -rw-r--r-- | boot/uboot/uboot-2010.03-fix-avr32.patch | 5 | ||||
| -rw-r--r-- | boot/uboot/uboot.mk | 5 |
3 files changed, 5 insertions, 15 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index dbd4f34df..070533efd 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME choice prompt "U-Boot Version" - default BR2_TARGET_UBOOT_2011_03 + default BR2_TARGET_UBOOT_2011_06 help Select the specific U-Boot version you want to use +config BR2_TARGET_UBOOT_2011_06 + bool "2011.06" + config BR2_TARGET_UBOOT_2011_03 bool "2011.03" @@ -28,9 +31,6 @@ config BR2_TARGET_UBOOT_2010_09 config BR2_TARGET_UBOOT_2010_06 bool "2010.06" -config BR2_TARGET_UBOOT_2010_03 - bool "2010.03" - config BR2_TARGET_UBOOT_CUSTOM_TARBALL bool "Custom tarball" @@ -48,11 +48,11 @@ endif config BR2_TARGET_UBOOT_VERSION string + default "2011.06" if BR2_TARGET_UBOOT_2011_06 default "2011.03" if BR2_TARGET_UBOOT_2011_03 default "2010.12" if BR2_TARGET_UBOOT_2010_12 default "2010.09" if BR2_TARGET_UBOOT_2010_09 default "2010.06" if BR2_TARGET_UBOOT_2010_06 - default "2010.03" if BR2_TARGET_UBOOT_2010_03 default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT diff --git a/boot/uboot/uboot-2010.03-fix-avr32.patch b/boot/uboot/uboot-2010.03-fix-avr32.patch deleted file mode 100644 index 1f9aab8f0..000000000 --- a/boot/uboot/uboot-2010.03-fix-avr32.patch +++ /dev/null @@ -1,5 +0,0 @@ -diff -Naur u-boot-2010.03-orig/include/asm-avr32/unaligned.h u-boot-2010.03/include/asm-avr32/unaligned.h ---- u-boot-2010.03-orig/include/asm-avr32/unaligned.h 1969-12-31 21:00:00.000000000 -0300 -+++ u-boot-2010.03/include/asm-avr32/unaligned.h 2010-06-22 23:09:49.000000000 -0300 -@@ -0,0 +1 @@ -+#include <asm-generic/unaligned.h> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index e87727b5d..ec592e13e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -33,11 +33,6 @@ endif UBOOT_ARCH=$(KERNEL_ARCH) -# u-boot in the past used arch=ppc for powerpc -ifneq ($(findstring x2010.03,x$(UBOOT_VERSION)),) -UBOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc) -endif - UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1 UBOOT_MAKE_OPTS += \ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ |