arm-trusted-firmware-mvebu: stop cluttering Image Builder

[openwrt/staging/hauke.git] / package / boot / arm-trusted-firmware-mvebu / Makefile

diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile
index dba4836a6b98867976f3eeeb695528b362603c38..3b7fd7a7cc5ad625803fbecc8b5b947cb60ee7df 100644 (file)
--- a/package/boot/arm-trusted-firmware-mvebu/Makefile
+++ b/package/boot/arm-trusted-firmware-mvebu/Makefile
@@ -108,12 +108,12 @@ TFA_TARGETS:= \
        udpu
 
 TFA_MAKE_FLAGS += \
-               CROSS_CM3=$(STAGING_DIR_IMAGE)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
+               CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
                BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
-               MV_DDR_PATH=$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \
-               WTP=$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \
-               WTMI_IMG=$(STAGING_DIR_IMAGE)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \
-               CRYPTOPP_PATH=$(STAGING_DIR_IMAGE)/$(CRYPTOPP_NAME) \
+               MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \
+               WTP=$(BUILD_DIR)/$(A3700_UTILS_NAME) \
+               WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \
+               CRYPTOPP_PATH=$(BUILD_DIR)/$(CRYPTOPP_NAME) \
                USE_COHERENT_MEM=0 \
                FIP_ALIGN=0x100 \
                DDR_TOPOLOGY=$(DDR_TOPOLOGY) \
@@ -190,11 +190,11 @@ endef
 
 define Build/Clean
        rm -rf \
-               $(STAGING_DIR_IMAGE)/$(CRYPTOPP_NAME) \
-               $(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME) \
-               $(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \
-               $(STAGING_DIR_IMAGE)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
-               $(STAGING_DIR_IMAGE)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)
+               $(BUILD_DIR)/$(CRYPTOPP_NAME) \
+               $(BUILD_DIR)/$(A3700_UTILS_NAME) \
+               $(BUILD_DIR)/$(MV_DDR_NAME) \
+               $(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
+               $(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)
 endef
 
 define Build/Prepare
@@ -207,23 +207,22 @@ define Build/Prepare
 
        $(call Build/Prepare/Default,)
 
-       mkdir -p $(STAGING_DIR_IMAGE)
-       $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(CRYPTOPP_SOURCE)
-       $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(A3700_UTILS_SOURCE)
-       $(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(A3700_UTILS_NAME),./patches-a3700-utils)
-       $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(MV_DDR_SOURCE)
-       $(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME),./patches-mv-ddr-marvell)
-       $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(MOX_BB_SOURCE)
-       $(call PatchDir/Default,$(STAGING_DIR_IMAGE)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE),./patches-mox-boot-builder)
-       $(TAR) -C $(STAGING_DIR_IMAGE) -xf $(DL_DIR)/$(CM3_GCC_SOURCE)
+       $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(CRYPTOPP_SOURCE)
+       $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(A3700_UTILS_SOURCE)
+       $(call PatchDir/Default,$(BUILD_DIR)/$(A3700_UTILS_NAME),./patches-a3700-utils)
+       $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MV_DDR_SOURCE)
+       $(call PatchDir/Default,$(BUILD_DIR)/$(MV_DDR_NAME),./patches-mv-ddr-marvell)
+       $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MOX_BB_SOURCE)
+       $(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE),./patches-mox-boot-builder)
+       $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(CM3_GCC_SOURCE)
 endef
 
 define Build/Compile
        +$(MAKE) \
-               CROSS_CM3=$(STAGING_DIR_IMAGE)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
+               CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
                WTMI_VERSION=$(MOX_BB_RELEASE) \
                CRYPTOPP_PATH=$PWD/cryptopp/ \
-               -C $(STAGING_DIR_IMAGE)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
+               -C $(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
                wtmi_app.bin
        $(call Build/Compile/Default)
 endef