arm-trusted-firmware-sunxi: enable H6 builds and bump to 20200423

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/package/boot/arm-trusted-firmware-sunxi/Makefile b/package/boot/arm-trusted-firmware-sunxi/Makefile
index 0211e5e03049812e8c0ac54571763ba18e2b2e6e..6a2eab97ff9ad16de4586b8423507cc3df73e581 100644 (file)
--- a/package/boot/arm-trusted-firmware-sunxi/Makefile
+++ b/package/boot/arm-trusted-firmware-sunxi/Makefile
@@ -12,8 +12,8 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/ARM-software/arm-trusted-firmware
-PKG_SOURCE_DATE:=2018-10-02
-PKG_SOURCE_VERSION:=dbc8d9496ead9ecdd7c2a276b542a4fbbbf64027
+PKG_SOURCE_DATE:=2020-04-23
+PKG_SOURCE_VERSION:=62b56a72d24460a8a126847bcc24b0798601289b
 PKG_MIRROR_HASH:=c81521a27b86f606e927b4e346286540b862828c8d49292eae1f5c6adfc24001
 
 PKG_LICENSE:=BSD-3-Clause
@@ -40,9 +40,21 @@ MAKE_FLAGS += \
        PLAT=sun50i_a64 \
        bl31
 
+define Build/Compile
+       +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               CROSS_COMPILE=$(TARGET_CROSS) \
+               PLAT=sun50i_a64 \
+               bl31
+       +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               CROSS_COMPILE=$(TARGET_CROSS) \
+               PLAT=sun50i_h6 \
+               bl31
+endef
+
 define Build/InstallDev
        $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-       $(CP) $(PKG_BUILD_DIR)/build/sun50i_a64/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31.bin
+       $(CP) $(PKG_BUILD_DIR)/build/sun50i_a64/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_a64.bin
+       $(CP) $(PKG_BUILD_DIR)/build/sun50i_h6/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_h6.bin
 endef
 
 define Package/arm-trusted-firmware-sunxi/install