arm-trusted-firmware-mvebu: update CM3 toolchain to v10.2

Linaro stopped shipping binary toolchains quite some time ago, switch over to
the ARM builds.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2021-06-08 08:31:39 +02:00 committed by Hauke Mehrtens
parent c552bbe00d
commit ac42765dca

View file

@ -107,7 +107,7 @@ TFA_TARGETS:= \
udpu udpu
TFA_MAKE_FLAGS += \ TFA_MAKE_FLAGS += \
CROSS_CM3=$(STAGING_DIR_IMAGE)/$(LINARO_NAME)-$(LINARO_RELEASE).$(LINARO_VERSION)/bin/arm-linux-gnueabi- \ CROSS_CM3=$(STAGING_DIR_IMAGE)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \ BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
MV_DDR_PATH=$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \ MV_DDR_PATH=$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \
WTP=$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \ WTP=$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \
@ -147,29 +147,29 @@ define Download/mv-ddr-marvell
SUBDIR:=$(MV_DDR_NAME) SUBDIR:=$(MV_DDR_NAME)
endef endef
LINARO_NAME:=gcc-linaro CM3_GCC_NAME:=gcc-arm
LINARO_RELEASE:=6 CM3_GCC_RELEASE:=10.2-2020.11
LINARO_VERSION:=5.0-2018.12-$(HOST_ARCH)_arm-linux-gnueabi CM3_GCC_VERSION:=$(HOST_ARCH)-arm-none-eabi
LINARO_SOURCE=$(LINARO_NAME)-$(LINARO_RELEASE).$(LINARO_VERSION).tar.xz CM3_GCC_SOURCE=$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION).tar.xz
define Download/gcc-linaro define Download/cm3-gcc
FILE:=$(LINARO_SOURCE) FILE:=$(CM3_GCC_SOURCE)
URL:=https://releases.linaro.org/components/toolchain/binaries/latest-$(LINARO_RELEASE)/arm-linux-gnueabi/ URL:=https://developer.arm.com/-/media/Files/downloads/gnu-a/$(CM3_GCC_RELEASE)/binrel
HASH:=2d4a92d6c8b384ae404b2e02c1c412e3ec18f9b714135acf046b2b1b510e9ace HASH:=bf7ee185936d22d787b80c8da573f72ead5675695331fb8b590f0133ef1f6bb9
endef endef
define Build/Clean define Build/Clean
rm -rf \ rm -rf \
$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \ $(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \
$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \ $(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \
$(STAGING_DIR_IMAGE)/$(LINARO_NAME)-$(LINARO_RELEASE).$(LINARO_VERSION) $(STAGING_DIR_IMAGE)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)
endef endef
define Build/Prepare define Build/Prepare
# Download sources # Download sources
$(eval $(call Download,a3700-utils)) $(eval $(call Download,a3700-utils))
$(eval $(call Download,mv-ddr-marvell)) $(eval $(call Download,mv-ddr-marvell))
$(eval $(call Download,gcc-linaro)) $(eval $(call Download,cm3-gcc))
$(call Build/Prepare/Default,) $(call Build/Prepare/Default,)
@ -180,7 +180,7 @@ define Build/Prepare
$(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(MV_DDR_SOURCE) $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(MV_DDR_SOURCE)
echo "master" > $(STAGING_DIR_IMAGE)/$(MV_DDR_NAME)/branch.txt echo "master" > $(STAGING_DIR_IMAGE)/$(MV_DDR_NAME)/branch.txt
$(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME),./patches-mv-ddr-marvell) $(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME),./patches-mv-ddr-marvell)
$(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(LINARO_SOURCE) $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(CM3_GCC_SOURCE)
endef endef
$(eval $(call BuildPackage/Trusted-Firmware-A)) $(eval $(call BuildPackage/Trusted-Firmware-A))