[OpenWrt-Devel] [PATCH] arm-trusted-firmware-sunxi: bump to v2.3-rc1 and use atf-builds binaries

[Petr Štetiar]

Update ATF to latest v2.3-rc1 version and use reproducible bl31 binaries
from atf-builds project.

atf-builds project started recently offering reproducible ATF binaries
which is more convenient then building very tiny ATF artifacts from
scratch during each build, thus saving considerable build resources.  It
has reduced build from scratch time on my CI builder for sunxi/cortexa53
target from 57min down to 29min.

Run tested on a64-olinuxino-emmc.

 U-Boot SPL 2020.04 (Apr 20 2020 - 08:28:05 +0000)
 DRAM: 1024 MiB
 Trying to boot from MMC1
 NOTICE:  BL31: v2.2():v2.3-rc1
 NOTICE:  BL31: Built : 19:20:57, Apr 15 2020
 NOTICE:  BL31: Detected Allwinner A64/H64/R18 SoC (1689)
 NOTICE:  BL31: Found U-Boot DTB at 0x4090dc0, model: Olimex A64-Olinuxino-eMMC

Cc: Zoltan HERPAI <wigyori at uid0.hu>
Cc: Hauke Mehrtens <hauke at hauke-m.de>
Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 .../boot/arm-trusted-firmware-sunxi/Makefile  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/package/boot/arm-trusted-firmware-sunxi/Makefile b/package/boot/arm-trusted-firmware-sunxi/Makefile
index 0211e5e03049..018aeb90f461 100644
--- a/package/boot/arm-trusted-firmware-sunxi/Makefile
+++ b/package/boot/arm-trusted-firmware-sunxi/Makefile
@@ -8,19 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-sunxi
+PKG_VERSION:=2.3-rc1
 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_MIRROR_HASH:=c81521a27b86f606e927b4e346286540b862828c8d49292eae1f5c6adfc24001
+PKG_SOURCE:=atf-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/atf-builds/atf/releases/download/v$(PKG_VERSION)/atf-v$(PKG_VERSION).tar.gz?
+PKG_HASH:=d3bd1e3d2dfe4ba5bc75785674695aac5655479b54159fb3d7bfa7253da52216
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=license.md
 
 PKG_MAINTAINER:=Hauke Mehrtens <hauke at hauke-m.de>
 
+MAKE_PATH:=$(PKG_NAME)
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -31,18 +32,16 @@ define Package/arm-trusted-firmware-sunxi
     DEPENDS:=@TARGET_sunxi_cortexa53
 endef
 
-export GCC_HONOUR_COPTS=s
-
-MAKE_VARS = \
-	CROSS_COMPILE="$(TARGET_CROSS)"
+define Build/Prepare
+	$(TAR) -C $(PKG_BUILD_DIR) -xf $(DL_DIR)/$(PKG_SOURCE)
+endef
 
-MAKE_FLAGS += \
-	PLAT=sun50i_a64 \
-	bl31
+define Build/Compile
+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)/sun50i_a64_bl31.bin $(STAGING_DIR_IMAGE)/bl31.bin
 endef
 
 define Package/arm-trusted-firmware-sunxi/install

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel