diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2020-07-21 21:49:09 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-07-21 21:49:09 +0000 |
| commit | 07678ff71381a9c99c66bfc4e55419fc5b13f796 (patch) | |
| tree | a95e5a925a74a25a195fbc166bb420b433add8f1 /plat/marvell/armada/a8k/common | |
| parent | f15c59d7ac8b24d342cd20523388dceba9fabbaa (diff) | |
| parent | 70ec0d72b6edf1966a77d328b6ebfcaf2bf6d114 (diff) | |
| download | arm-trusted-firmware-07678ff71381a9c99c66bfc4e55419fc5b13f796.tar.gz | |
Merge changes I0826ef8b,I9b4659a1 into integration
* changes:
plat: marvell: armada: a8k: Add support for iEi Puzzle-M801 board
plat: marvell: armada: a8k: common: Fix a8k_common.mk to use BOARD_DIR variable
Diffstat (limited to 'plat/marvell/armada/a8k/common')
| -rw-r--r-- | plat/marvell/armada/a8k/common/a8k_common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/marvell/armada/a8k/common/a8k_common.mk b/plat/marvell/armada/a8k/common/a8k_common.mk index 0446b8de7..02f1553b0 100644 --- a/plat/marvell/armada/a8k/common/a8k_common.mk +++ b/plat/marvell/armada/a8k/common/a8k_common.mk @@ -37,7 +37,7 @@ ROM_BIN_EXT ?= $(BUILD_PLAT)/ble.bin DOIMAGE_FLAGS += -b $(ROM_BIN_EXT) $(NAND_DOIMAGE_FLAGS) $(DOIMAGE_SEC_FLAGS) # Check whether to build system_power.c for the platform -ifneq ("$(wildcard $(PLAT_FAMILY_BASE)/$(PLAT)/board/system_power.c)","") +ifneq ("$(wildcard $(BOARD_DIR)/board/system_power.c)","") SYSTEM_POWER_SUPPORT = 1 else SYSTEM_POWER_SUPPORT = 0 @@ -91,7 +91,7 @@ MARVELL_DRV := $(MARVELL_DRV_BASE)/io_win.c \ BL31_PORTING_SOURCES := $(BOARD_DIR)/board/marvell_plat_config.c ifeq ($(SYSTEM_POWER_SUPPORT),1) -BL31_PORTING_SOURCES += $(PLAT_FAMILY_BASE)/$(PLAT)/board/system_power.c +BL31_PORTING_SOURCES += $(BOARD_DIR)/board/system_power.c endif BL31_SOURCES += lib/cpus/aarch64/cortex_a72.S \ |