[packages] uboot-sunxi: various updates

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

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index 5ab52360f28f7912b4e7d74314cd3f8655eb9fd5..eb66cab4719ae2a546b5180cdb8e2df2bc66e595 100644 (file)
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
-PKG_VERSION:=2014.04
+PKG_VERSION:=2015.01-rc3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
        http://mirror2.openwrt.org/sources \
        ftp://ftp.denx.de/pub/u-boot
-PKG_SOURCE_VERSION:=6d2116d1385a66e9a59742caa9d62a54
+PKG_SOURCE_VERSION:=e680848838ca20a60d43b66a218d865b
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPL-2.0 GPL-2.0+
+PKG_LICENSE_FILES:=Licenses/README
+
 include $(INCLUDE_DIR)/package.mk
 
 define uboot/Default
@@ -25,50 +28,76 @@ define uboot/Default
 endef
 
 define uboot/A10-OLinuXino-Lime
-  TITLE:=U-Boot 2014.04 for the A10 OLinuXino LIME
+  TITLE:=U-Boot for the A10 OLinuXino LIME
 endef
 
 define uboot/A13-OLinuXino
-  TITLE:=U-Boot 2014.04 for the A13 OlinuXino
+  TITLE:=U-Boot for the A13 OlinuXino
+endef
+
+define uboot/A20-OLinuXino-Lime
+  TITLE:=U-Boot for the A20 OLinuXino LIME
 endef
 
 define uboot/A20-OLinuXino_MICRO
-  TITLE:=U-Boot 2014.04 for A20 OLinuXino MICRO
+  TITLE:=U-Boot for A20 OLinuXino MICRO
 endef
 
 define uboot/Bananapi
-  TITLE:=U-Boot 2014.04 for Bananapi
+  TITLE:=U-Boot for Bananapi
+endef
+
+define uboot/Bananapro
+  TITLE:=U-Boot for Bananapro
 endef
 
 define uboot/Cubieboard
-  TITLE:=U-Boot 2014.04 for Cubieboard
+  TITLE:=U-Boot for Cubieboard
 endef
 
 define uboot/Cubieboard2
-  TITLE:=U-Boot 2014.04 for Cubieboard2
+  TITLE:=U-Boot for Cubieboard2
 endef
 
 define uboot/Cubietruck
-  TITLE:=U-Boot 2014.04 for Cubietruck
+  TITLE:=U-Boot for Cubietruck
 endef
 
 define uboot/Hackberry
-  TITLE:=U-Boot 2014.04 for the Hackbeery
+  TITLE:=U-Boot for the Hackbeery
+endef
+
+define uboot/Mele_M9
+  TITLE:=U-Boot for the Mele M9 (A31)
 endef
 
 define uboot/OLIMEX-A13-SOM
-  TITLE:=U-Boot 2014.04 for the Olimex A13 SOM
+  TITLE:=U-Boot for the Olimex A13 SOM
 endef
 
-define uboot/pcDuino
-  TITLE:=U-Boot 2014.04 for pcDuino
+define uboot/Linksprite_pcDuino
+  TITLE:=U-Boot for Linksprite pcDuino
 endef  
 
 define uboot/Linksprite_pcDuino3
-  TITLE:=U-Boot 2014.04 for Linksprite pcDuino3
+  TITLE:=U-Boot for Linksprite pcDuino3
 endef  
 
-UBOOTS:=A10-OLinuXino-Lime A13-OLinuXino A20-OLinuXino_MICRO Bananapi Cubieboard Cubieboard2 Cubietruck Hackberry pcDuino Linksprite_pcDuino3 OLIMEX-A13-SOM
+UBOOTS:= \
+       A10-OLinuXino-Lime \
+       A13-OLinuXino \
+       A20-OLinuXino-Lime \
+       A20-OLinuXino_MICRO \
+       Bananapi \
+       Bananapro \
+       Cubieboard \
+       Cubieboard2 \
+       Cubietruck \
+       Hackberry \
+       Mele_M9 \
+       OLIMEX-A13-SOM \
+       Linksprite_pcDuino \
+       Linksprite_pcDuino3 \
 
 define Package/uboot/template
 define Package/uboot-sunxi-$(1)
@@ -96,7 +125,7 @@ endif
 
 define Build/Configure
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config
+               USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_defconfig
 endef
 
 define Build/Compile
@@ -114,6 +143,7 @@ define Package/uboot/install/default
                $(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
+       mkimage -C none -A arm -T script -d $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-boot.scr
 endef
 
 define Package/uboot/install/template