From 0412b7323db50da35beaaa56158993be8f056910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Mon, 19 Oct 2020 17:10:11 +0200 Subject: [PATCH] plat: marvell: armada: Fix including plat/marvell/marvell.mk file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Include file plat/marvell/marvell.mk for platform A3700 was included two times. Once from file plat/marvell/armada/a3k/common/a3700_common.mk and second time from common file plat/marvell/armada/common/marvell_common.mk. It caused following warning every time was make called: plat/marvell/marvell.mk:51: warning: overriding recipe for target 'mrvl_clean' plat/marvell/marvell.mk:51: warning: ignoring old recipe for target 'mrvl_clean' Change in this commit removes inclusion of plat/marvell/marvell.mk file in common file plat/marvell/armada/common/marvell_common.mk. As a80x0 platform needs this include file, add it also into a80x0 platform specific include file lat/marvell/armada/a8k/common/a8k_common.mk. Also moves inclusion of plat/marvell/marvell.mk file in a3700 platform file plat/marvell/armada/a3k/common/a3700_common.mk at correct place. Global plat/marvell/marvell.mk expects that variables DOIMAGEPATH and DOIMAGETOOL are already defined, but it defines MARVELL_SECURE_BOOT variable which is needed by plat/marvell/armada/a3k/common/a3700_common.mk. Signed-off-by: Pali Rohár Change-Id: I5cbbd7eb8a3376924419f9850516b2a4924be5aa --- plat/marvell/armada/a3k/common/a3700_common.mk | 4 ++-- plat/marvell/armada/a8k/common/a8k_common.mk | 2 ++ plat/marvell/armada/common/marvell_common.mk | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plat/marvell/armada/a3k/common/a3700_common.mk b/plat/marvell/armada/a3k/common/a3700_common.mk index a135d5fd2..8f65e92b3 100644 --- a/plat/marvell/armada/a3k/common/a3700_common.mk +++ b/plat/marvell/armada/a3k/common/a3700_common.mk @@ -15,8 +15,6 @@ MARVELL_DRV_BASE := drivers/marvell MARVELL_COMMON_BASE := $(MARVELL_PLAT_BASE)/common HANDLE_EA_EL3_FIRST := 1 -include plat/marvell/marvell.mk - #*********** A3700 ************* # GICV3 @@ -69,6 +67,8 @@ ifneq (${WTP},) DOIMAGEPATH := $(WTP) DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/linux/tbb_linux +include plat/marvell/marvell.mk + ifeq ($(MARVELL_SECURE_BOOT),1) DOIMAGE_CFG := $(DOIMAGEPATH)/atf-tim.txt IMAGESPATH := $(DOIMAGEPATH)/tim/trusted diff --git a/plat/marvell/armada/a8k/common/a8k_common.mk b/plat/marvell/armada/a8k/common/a8k_common.mk index 02f1553b0..a807891e5 100644 --- a/plat/marvell/armada/a8k/common/a8k_common.mk +++ b/plat/marvell/armada/a8k/common/a8k_common.mk @@ -33,6 +33,8 @@ $(eval $(call add_define,AP_NUM)) DOIMAGEPATH ?= tools/marvell/doimage DOIMAGETOOL ?= ${DOIMAGEPATH}/doimage +include plat/marvell/marvell.mk + ROM_BIN_EXT ?= $(BUILD_PLAT)/ble.bin DOIMAGE_FLAGS += -b $(ROM_BIN_EXT) $(NAND_DOIMAGE_FLAGS) $(DOIMAGE_SEC_FLAGS) diff --git a/plat/marvell/armada/common/marvell_common.mk b/plat/marvell/armada/common/marvell_common.mk index 2e96e2f84..1cc6dba60 100644 --- a/plat/marvell/armada/common/marvell_common.mk +++ b/plat/marvell/armada/common/marvell_common.mk @@ -7,7 +7,6 @@ MARVELL_PLAT_BASE := plat/marvell/armada MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell/armada include plat/marvell/version.mk -include plat/marvell/marvell.mk VERSION_STRING +=(Marvell-${SUBVERSION})