sunxi: boot changes

[openwrt-github/.git] / package / boot / uboot-sunxi / Makefile

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index da729dd9696d4e38f51096f72929a7e21f92e11e..796a6045ccef494c7d6cfa20c7669cc1a52571f1 100644 (file)
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/linux-sunxi/u-boot-sunxi
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8a4621c488f33089d831168bfa5bae210a5684c8
+PKG_SOURCE_VERSION:=b322f6723d59b9bb88701991c7b8b15867bf3692
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -25,12 +25,16 @@ define uboot/Default
   IMAGE:=
 endef
 
+define uboot/A10-OLinuXino-Lime
+  TITLE:=U-Boot 2013.10-rc2 for the A10 OLinuXino LIME
+endef
+
 define uboot/A13-OLinuXino
-  TITLE:=U-Boot 2013.10-rc2 for the A13 Olinuxino
+  TITLE:=U-Boot 2013.10-rc2 for the A13 OlinuXino
 endef
 
-define uboot/Hackberry
-  TITLE:=U-Boot 2013.10-rc2 for the Hackbeery
+define uboot/A20-OLinuXino_MICRO
+  TITLE:=U-Boot 2013.10-rc2 for A20 OLinuXino MICRO
 endef
 
 define uboot/Cubieboard
@@ -41,11 +45,19 @@ define uboot/Cubieboard2
   TITLE:=U-Boot 2013.10-rc2 for Cubieboard2
 endef
 
-define uboot/A20-OLinuXino_MICRO
-  TITLE:=U-Boot 2013.10-rc2 for A20 Olinuxino
+define uboot/Cubietruck
+  TITLE:=U-Boot 2013.10-rc2 for Cubietruck
 endef
 
-UBOOTS:=A13-OLinuXino Cubieboard Cubieboard2 A20-OLinuXino_MICRO Hackberry
+define uboot/Hackberry
+  TITLE:=U-Boot 2013.10-rc2 for the Hackbeery
+endef
+
+define uboot/pcDuino
+  TITLE:=U-Boot 2013.10-rc2 for pcDuino
+endef  
+
+UBOOTS:=A10-OLinuXino-Lime A13-OLinuXino A20-OLinuXino_MICRO Cubieboard Cubieboard2 Cubietruck Hackberry pcDuino
 
 define Package/uboot/template
 define Package/uboot-sunxi-$(1)
@@ -73,7 +85,7 @@ endif
 
 define Build/Configure
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(UBOOT_CONFIG)_config
+               USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config
 endef
 
 define Build/Compile
@@ -86,9 +98,11 @@ define Package/uboot/install/default
        $(CP) $(PKG_BUILD_DIR)/u-boot.bin \
                $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot.bin
        $(CP) $(PKG_BUILD_DIR)/spl/sunxi-spl.bin \
-               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-sunxi-spl.bin
+               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-spl.bin
        $(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
-               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-sunxi-with-spl.bin
+               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot-with-spl.bin
+       $(CP) uEnv.txt \
+               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt
 endef
 
 define Package/uboot/install/template