plat: marvell: armada: modify PLAT_FAMILY name for 37xx SoCs

The Marvell Armada 37xx SoCs-based platforms contain a bit awkward directory structure because the currently only one supported PLAT and PLAT_FAMILY are the same. Modify the latter to 'a3k' in order to improve it and keep plat/marvell/armada tree more consistent: plat/marvell/ ├── armada │ ├── a3k │ │ ├── a3700 [...] │ ├── a8k │ │ ├── a70x0 [...] Change-Id: I693a6ef88e6ce49a326a3328875c90bbc186066a Signed-off-by: Marcin Wojtas <mw@semihalf.com>
2020-06-18 19:50:47 +02:00 · 2020-06-18 19:50:47 +02:00 · b5c850d48d
parent 9935047b20
commit b5c850d48d
24 changed files with 2 additions and 2 deletions
--- a/include/plat/marvell/armada/a3700/common/armada_common.h
+++ b/include/plat/marvell/armada/a3700/common/armada_common.h
--- a/include/plat/marvell/armada/a3700/common/board_marvell_def.h
+++ b/include/plat/marvell/armada/a3700/common/board_marvell_def.h
--- a/include/plat/marvell/armada/a3700/common/marvell_def.h
+++ b/include/plat/marvell/armada/a3700/common/marvell_def.h
--- a/include/plat/marvell/armada/a3700/common/plat_marvell.h
+++ b/include/plat/marvell/armada/a3700/common/plat_marvell.h
--- a/plat/marvell/armada/a3700/a3700/board/pm_src.c
+++ b/plat/marvell/armada/a3700/a3700/board/pm_src.c
--- a/plat/marvell/armada/a3700/a3700/mvebu_def.h
+++ b/plat/marvell/armada/a3700/a3700/mvebu_def.h
--- a/plat/marvell/armada/a3700/a3700/plat_bl31_setup.c
+++ b/plat/marvell/armada/a3700/a3700/plat_bl31_setup.c
--- a/plat/marvell/armada/a3700/a3700/platform.mk
+++ b/plat/marvell/armada/a3700/a3700/platform.mk
@ -5,6 +5,6 @@
 # https://spdx.org/licenses
 #

-include plat/marvell/armada/a3700/common/a3700_common.mk
+include plat/marvell/armada/a3k/common/a3700_common.mk

 include plat/marvell/armada/common/marvell_common.mk
--- a/plat/marvell/armada/a3700/common/a3700_common.mk
+++ b/plat/marvell/armada/a3700/common/a3700_common.mk
@ -7,7 +7,7 @@

 MARVELL_PLAT_BASE		:= plat/marvell/armada
 MARVELL_PLAT_INCLUDE_BASE	:= include/plat/marvell/armada
-PLAT_FAMILY			:= a3700
+PLAT_FAMILY			:= a3k
 PLAT_FAMILY_BASE		:= $(MARVELL_PLAT_BASE)/$(PLAT_FAMILY)
 PLAT_INCLUDE_BASE		:= $(MARVELL_PLAT_INCLUDE_BASE)/$(PLAT_FAMILY)
 PLAT_COMMON_BASE		:= $(PLAT_FAMILY_BASE)/common
--- a/plat/marvell/armada/a3700/common/a3700_ea.c
+++ b/plat/marvell/armada/a3700/common/a3700_ea.c
--- a/plat/marvell/armada/a3700/common/a3700_sip_svc.c
+++ b/plat/marvell/armada/a3700/common/a3700_sip_svc.c
--- a/plat/marvell/armada/a3700/common/aarch64/a3700_common.c
+++ b/plat/marvell/armada/a3700/common/aarch64/a3700_common.c
--- a/plat/marvell/armada/a3700/common/aarch64/plat_helpers.S
+++ b/plat/marvell/armada/a3700/common/aarch64/plat_helpers.S
--- a/plat/marvell/armada/a3700/common/dram_win.c
+++ b/plat/marvell/armada/a3700/common/dram_win.c
--- a/plat/marvell/armada/a3700/common/include/a3700_plat_def.h
+++ b/plat/marvell/armada/a3700/common/include/a3700_plat_def.h
--- a/plat/marvell/armada/a3700/common/include/a3700_pm.h
+++ b/plat/marvell/armada/a3700/common/include/a3700_pm.h
--- a/plat/marvell/armada/a3700/common/include/ddr_info.h
+++ b/plat/marvell/armada/a3700/common/include/ddr_info.h
--- a/plat/marvell/armada/a3700/common/include/dram_win.h
+++ b/plat/marvell/armada/a3700/common/include/dram_win.h
--- a/plat/marvell/armada/a3700/common/include/io_addr_dec.h
+++ b/plat/marvell/armada/a3700/common/include/io_addr_dec.h
--- a/plat/marvell/armada/a3700/common/include/plat_macros.S
+++ b/plat/marvell/armada/a3700/common/include/plat_macros.S
--- a/plat/marvell/armada/a3700/common/include/platform_def.h
+++ b/plat/marvell/armada/a3700/common/include/platform_def.h
--- a/plat/marvell/armada/a3700/common/io_addr_dec.c
+++ b/plat/marvell/armada/a3700/common/io_addr_dec.c
--- a/plat/marvell/armada/a3700/common/marvell_plat_config.c
+++ b/plat/marvell/armada/a3700/common/marvell_plat_config.c
--- a/plat/marvell/armada/a3700/common/plat_pm.c
+++ b/plat/marvell/armada/a3700/common/plat_pm.c