packages: uboot-sunxi: bump to 2015.07 - switch to using kernel-supplied dtc - refres...

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

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index c956ea98eba29ae77b509a7a14866d62c66af58f..1aeeceb9e07069e26b28720d10c0ddf4543b2e7c 100644 (file)
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -1,22 +1,27 @@
 #
-# 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.
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=u-boot
-PKG_VERSION:=2013.10-rc2-sunxi
-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:=b322f6723d59b9bb88701991c7b8b15867bf3692
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_VERSION:=2015.07
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+       http://mirror2.openwrt.org/sources \
+       ftp://ftp.denx.de/pub/u-boot
+
+PKG_MD5SUM:=3dac9a0b46fed77fc768ad3bd2d68c05
+
 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
@@ -26,34 +31,76 @@ define uboot/Default
 endef
 
 define uboot/A10-OLinuXino-Lime
-  TITLE:=U-Boot 2013.10-rc2 for the A10 OLinuXino LIME
+  TITLE:=U-Boot for the A10 OLinuXino LIME
 endef
 
 define uboot/A13-OLinuXino
-  TITLE:=U-Boot 2013.10-rc2 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 for A20 OLinuXino MICRO
+endef
+
+define uboot/Bananapi
+  TITLE:=U-Boot for Bananapi
 endef
 
-define uboot/Hackberry
-  TITLE:=U-Boot 2013.10-rc2 for the Hackbeery
+define uboot/Bananapro
+  TITLE:=U-Boot for Bananapro
 endef
 
 define uboot/Cubieboard
-  TITLE:=U-Boot 2013.10-rc2 for Cubieboard
+  TITLE:=U-Boot for Cubieboard
 endef
 
 define uboot/Cubieboard2
-  TITLE:=U-Boot 2013.10-rc2 for Cubieboard2
+  TITLE:=U-Boot for Cubieboard2
 endef
 
-define uboot/A20-OLinuXino_MICRO
-  TITLE:=U-Boot 2013.10-rc2 for A20 OLinuXino MICRO
+define uboot/Cubietruck
+  TITLE:=U-Boot for Cubietruck
+endef
+
+define uboot/Mele_M9
+  TITLE:=U-Boot for the Mele M9 (A31)
+endef
+
+define uboot/OLIMEX_A13_SOM
+  TITLE:=U-Boot for the Olimex A13 SOM
 endef
 
-define uboot/pcDuino
-  TITLE:=U-Boot 2013.10-rc2 for pcDuino
+define uboot/Linksprite_pcDuino
+  TITLE:=U-Boot for Linksprite pcDuino
 endef  
 
-UBOOTS:=A10-OLinuXino-Lime A13-OLinuXino Cubieboard Cubieboard2 A20-OLinuXino_MICRO Hackberry pcDuino
+define uboot/Linksprite_pcDuino3
+  TITLE:=U-Boot for Linksprite pcDuino3
+endef  
+
+define uboot/Lamobo_R1
+  TITLE:=U-Boot for Lamobo R1
+endef
+
+UBOOTS:= \
+       A10-OLinuXino-Lime \
+       A13-OLinuXino \
+       A20-OLinuXino-Lime \
+       A20-OLinuXino_MICRO \
+       Bananapi \
+       Bananapro \
+       Cubieboard \
+       Cubieboard2 \
+       Cubietruck \
+       Mele_M9 \
+       OLIMEX_A13_SOM \
+       Linksprite_pcDuino \
+       Linksprite_pcDuino3 \
+       Lamobo_R1 \
 
 define Package/uboot/template
 define Package/uboot-sunxi-$(1)
@@ -81,12 +128,13 @@ 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
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CROSS_COMPILE=$(TARGET_CROSS)
+               CROSS_COMPILE=$(TARGET_CROSS) \
+               DTCDIR=$(LINUX_DIR)/scripts/dtc/
 endef
 
 define Package/uboot/install/default
@@ -94,9 +142,12 @@ 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
+       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