summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Porotchkin <kostap@marvell.com>2018-06-27 15:54:16 +0300
committerKostya Porotchkin <kostap@marvell.com>2018-06-28 11:14:34 +0300
commit4ae99bb7374b7c2a3610cea7f51faf4f31ae729b (patch)
tree685ac3a0d519e34bcb190d1aff6f3eec99e34340
parentac4c9c9e15a17647a7493a6283b13cca481ea971 (diff)
plat: marvell: rearrange platform make files
Move all board specific definition from common platform file to the appropriate platform board make files This patch also fixes DRAM initialization ussue with A3900-A1 board that happen due to wrongly linked ap806 driver instead of the expected ap807. Change-Id: If28ce48969541ae642557f44adfba9ce5b852152 Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Reviewed-on: http://vgitil04.il.marvell.com:8080/57421 Reviewed-by: Ofir Fedida <ofedida@marvell.com> Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Diffstat
-rw-r--r--plat/marvell/a8k/a3900/platform.mk13
-rw-r--r--plat/marvell/a8k/a3900_z1/platform.mk7
-rw-r--r--plat/marvell/a8k/a70x0/platform.mk7
-rw-r--r--plat/marvell/a8k/a70x0_amc/platform.mk6
-rw-r--r--plat/marvell/a8k/a70x0_cust/platform.mk6
-rw-r--r--plat/marvell/a8k/a70x0_pcac/platform.mk6
-rw-r--r--plat/marvell/a8k/a80x0/platform.mk7
-rw-r--r--plat/marvell/a8k/a80x0_mcbin/platform.mk7
-rw-r--r--plat/marvell/a8k/a80x0_ocp/platform.mk7
-rw-r--r--plat/marvell/a8k/common/a8k_common.mk18
10 files changed, 60 insertions, 24 deletions
diff --git a/plat/marvell/a8k/a3900/platform.mk b/plat/marvell/a8k/a3900/platform.mk
index 64923a5f..f6673dc5 100644
--- a/plat/marvell/a8k/a3900/platform.mk
+++ b/plat/marvell/a8k/a3900/platform.mk
@@ -5,13 +5,12 @@
# https://spdx.org/licenses
#
-include plat/marvell/a8k/common/a8k_common.mk
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
-include plat/marvell/common/marvell_common.mk
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/ap807_setup.c
-# A3900 Z2 use AP807 instead AP806, update the source list
-BL31_SOURCES := $(filter-out $(MARVELL_DRV_BASE)/mochi/apn806_setup.c, $(BL31_SOURCES))
-BL31_SOURCES += $(MARVELL_DRV_BASE)/mochi/ap807_setup.c
+include plat/marvell/a8k/common/a8k_common.mk
-BLE_SOURCES := $(filter-out $(MARVELL_DRV_BASE)/mochi/apn806_setup.c, $(BLE_SOURCES))
-BLE_SOURCES += $(MARVELL_DRV_BASE)/mochi/ap807_setup.c \ No newline at end of file
+include plat/marvell/common/marvell_common.mk \ No newline at end of file
diff --git a/plat/marvell/a8k/a3900_z1/platform.mk b/plat/marvell/a8k/a3900_z1/platform.mk
index 4e90dbcc..d5861e2f 100644
--- a/plat/marvell/a8k/a3900_z1/platform.mk
+++ b/plat/marvell/a8k/a3900_z1/platform.mk
@@ -3,6 +3,13 @@
#
# SPDX-License-Identifier: BSD-3-Clause
# https://spdx.org/licenses
+#
+
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk
diff --git a/plat/marvell/a8k/a70x0/platform.mk b/plat/marvell/a8k/a70x0/platform.mk
index 4e90dbcc..d5861e2f 100644
--- a/plat/marvell/a8k/a70x0/platform.mk
+++ b/plat/marvell/a8k/a70x0/platform.mk
@@ -3,6 +3,13 @@
#
# SPDX-License-Identifier: BSD-3-Clause
# https://spdx.org/licenses
+#
+
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk
diff --git a/plat/marvell/a8k/a70x0_amc/platform.mk b/plat/marvell/a8k/a70x0_amc/platform.mk
index c0d79514..d5861e2f 100644
--- a/plat/marvell/a8k/a70x0_amc/platform.mk
+++ b/plat/marvell/a8k/a70x0_amc/platform.mk
@@ -5,6 +5,12 @@
# https://spdx.org/licenses
#
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
+
include plat/marvell/a8k/common/a8k_common.mk
include plat/marvell/common/marvell_common.mk
diff --git a/plat/marvell/a8k/a70x0_cust/platform.mk b/plat/marvell/a8k/a70x0_cust/platform.mk
index c0d79514..d5861e2f 100644
--- a/plat/marvell/a8k/a70x0_cust/platform.mk
+++ b/plat/marvell/a8k/a70x0_cust/platform.mk
@@ -5,6 +5,12 @@
# https://spdx.org/licenses
#
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
+
include plat/marvell/a8k/common/a8k_common.mk
include plat/marvell/common/marvell_common.mk
diff --git a/plat/marvell/a8k/a70x0_pcac/platform.mk b/plat/marvell/a8k/a70x0_pcac/platform.mk
index c0d79514..06ddf0ad 100644
--- a/plat/marvell/a8k/a70x0_pcac/platform.mk
+++ b/plat/marvell/a8k/a70x0_pcac/platform.mk
@@ -5,6 +5,12 @@
# https://spdx.org/licenses
#
+PCI_EP_SUPPORT := 1
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_7K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
+
include plat/marvell/a8k/common/a8k_common.mk
include plat/marvell/common/marvell_common.mk
diff --git a/plat/marvell/a8k/a80x0/platform.mk b/plat/marvell/a8k/a80x0/platform.mk
index 4e90dbcc..4c0ab006 100644
--- a/plat/marvell/a8k/a80x0/platform.mk
+++ b/plat/marvell/a8k/a80x0/platform.mk
@@ -3,6 +3,13 @@
#
# SPDX-License-Identifier: BSD-3-Clause
# https://spdx.org/licenses
+#
+
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_8K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk
diff --git a/plat/marvell/a8k/a80x0_mcbin/platform.mk b/plat/marvell/a8k/a80x0_mcbin/platform.mk
index 4e90dbcc..4c0ab006 100644
--- a/plat/marvell/a8k/a80x0_mcbin/platform.mk
+++ b/plat/marvell/a8k/a80x0_mcbin/platform.mk
@@ -3,6 +3,13 @@
#
# SPDX-License-Identifier: BSD-3-Clause
# https://spdx.org/licenses
+#
+
+PCI_EP_SUPPORT := 0
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_8K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk
diff --git a/plat/marvell/a8k/a80x0_ocp/platform.mk b/plat/marvell/a8k/a80x0_ocp/platform.mk
index 4e90dbcc..cb97af8c 100644
--- a/plat/marvell/a8k/a80x0_ocp/platform.mk
+++ b/plat/marvell/a8k/a80x0_ocp/platform.mk
@@ -3,6 +3,13 @@
#
# SPDX-License-Identifier: BSD-3-Clause
# https://spdx.org/licenses
+#
+
+PCI_EP_SUPPORT := 1
+
+DOIMAGE_SEC := tools/doimage/secure/sec_img_8K.cfg
+
+MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
include plat/marvell/a8k/common/a8k_common.mk
diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/a8k/common/a8k_common.mk
index 5c98878c..20ae349a 100644
--- a/plat/marvell/a8k/common/a8k_common.mk
+++ b/plat/marvell/a8k/common/a8k_common.mk
@@ -22,27 +22,12 @@ MSS_SUPPORT := 1
BL31_CACHE_DISABLE := 1
$(eval $(call add_define,BL31_CACHE_DISABLE))
-# Enable end point only for 7040 PCAC
-ifeq ($(PLAT),$(filter $(PLAT),a70x0_pcac))
-PCI_EP_SUPPORT := 1
-else
-PCI_EP_SUPPORT := 0
-endif
-ifeq ($(PLAT),$(filter $(PLAT),a80x0_ocp))
-PCI_EP_SUPPORT := 1
-endif
$(eval $(call add_define,PCI_EP_SUPPORT))
$(eval $(call assert_boolean,PCI_EP_SUPPORT))
DOIMAGEPATH ?= tools/doimage
DOIMAGETOOL ?= ${DOIMAGEPATH}/doimage
-ifeq ($(findstring a80x0,${PLAT}),)
-DOIMAGE_SEC := ${DOIMAGEPATH}/secure/sec_img_7K.cfg
-else
-DOIMAGE_SEC := ${DOIMAGEPATH}/secure/sec_img_8K.cfg
-endif # PLAT == a8K/a7K
-
ROM_BIN_EXT ?= $(BUILD_PLAT)/ble.bin
DOIMAGE_FLAGS += -b $(ROM_BIN_EXT) $(NAND_DOIMAGE_FLAGS) $(DOIMAGE_SEC_FLAGS)
@@ -70,8 +55,7 @@ PLAT_BL_COMMON_SOURCES := $(PLAT_COMMON_BASE)/aarch64/a8k_common.c \
BLE_PORTING_SOURCES := $(PLAT_FAMILY_BASE)/$(PLAT)/board/dram_port.c \
$(PLAT_FAMILY_BASE)/$(PLAT)/board/marvell_plat_config.c
-MARVELL_MOCHI_DRV := $(MARVELL_DRV_BASE)/mochi/apn806_setup.c \
- $(MARVELL_DRV_BASE)/mochi/cp110_setup.c
+MARVELL_MOCHI_DRV += $(MARVELL_DRV_BASE)/mochi/cp110_setup.c
BLE_SOURCES := $(PLAT_COMMON_BASE)/plat_ble_setup.c \
$(MARVELL_MOCHI_DRV) \
generated by cgit (git 2.34.1) at 2024-05-05 01:08:54 +0000