Commit e488c285 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

uboot: Add 2011.06, remove 2010.03 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent f45f775b

boot/uboot/Config.in

+5 −5
Original line number Diff line number Diff line
@@ -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

boot/uboot/uboot-2010.03-fix-avr32.patch

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
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>

boot/uboot/uboot.mk

+0 −5
Original line number Diff line number Diff line
@@ -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)" \