diff options
| author | Lauren Wehrmeister <lauren.wehrmeister@arm.com> | 2021-01-25 21:41:25 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-01-25 21:41:25 +0000 |
| commit | 036e9c177f8ac4ece205607fba98b0a16dc45703 (patch) | |
| tree | da639f3606d44ed7bbce29f1d365451fb629ae51 /plat | |
| parent | 009553fc13c55e5105f1382336793f98d4a3fd9e (diff) | |
| parent | 4727fd1320940c2d89c75c13645864c46a24d96d (diff) | |
Merge changes I635cf82e,Iee3b4e0d into integration
* changes:
Makefile: Fix ${FIP_NAME} to be rebuilt only when needed
Makefile: Do not mark file targets as .PHONY target
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/common/board_common.mk | 1 | ||||
| -rw-r--r-- | plat/marvell/armada/a3k/common/a3700_common.mk | 3 | ||||
| -rw-r--r-- | plat/marvell/armada/a8k/common/a8k_common.mk | 3 | ||||
| -rw-r--r-- | plat/marvell/armada/a8k/common/ble/ble.mk | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk index 1885a600a7..6db0c00312 100644 --- a/plat/arm/board/common/board_common.mk +++ b/plat/arm/board/common/board_common.mk @@ -41,7 +41,6 @@ $(eval $(call add_define,ARM_ROTPK_LOCATION_ID)) # Force generation of the new hash if ROT_KEY is specified ifdef ROT_KEY HASH_PREREQUISITES = $(ROT_KEY) FORCE -FORCE: else HASH_PREREQUISITES = $(ROT_KEY) endif diff --git a/plat/marvell/armada/a3k/common/a3700_common.mk b/plat/marvell/armada/a3k/common/a3700_common.mk index 74cf78ac57..824a3c6901 100644 --- a/plat/marvell/armada/a3k/common/a3700_common.mk +++ b/plat/marvell/armada/a3k/common/a3700_common.mk @@ -212,6 +212,3 @@ mrvl_flash: $(error "Platform '${PLAT}' for target '$@' requires WTP. Please set WTP to point to the right directory") endif # WTP - -.PHONY: FORCE -FORCE:; diff --git a/plat/marvell/armada/a8k/common/a8k_common.mk b/plat/marvell/armada/a8k/common/a8k_common.mk index cf1516a28d..b7c7d848d0 100644 --- a/plat/marvell/armada/a8k/common/a8k_common.mk +++ b/plat/marvell/armada/a8k/common/a8k_common.mk @@ -166,6 +166,3 @@ ${DOIMAGETOOL}: FORCE .PHONY: mrvl_flash mrvl_flash: ${BUILD_PLAT}/${BOOT_IMAGE} ${DOIMAGETOOL} ${DOIMAGETOOL} ${DOIMAGE_FLAGS} ${BUILD_PLAT}/${BOOT_IMAGE} ${BUILD_PLAT}/${FLASH_IMAGE} - -.PHONY: FORCE -FORCE:; diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk index 60fbf5f1d2..78c62a0103 100644 --- a/plat/marvell/armada/a8k/common/ble/ble.mk +++ b/plat/marvell/armada/a8k/common/ble/ble.mk @@ -26,7 +26,5 @@ PLAT_INCLUDES += -I$(MV_DDR_PATH) \ BLE_LINKERFILE := $(BLE_PATH)/ble.ld.S -FORCE: - $(MV_DDR_LIB): FORCE @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(PLAT_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble |