marvell: armada: add extra level in marvell platform hierarchy
This commit is a preparation for upcoming support for OcteonTX and
OcteonTX2 product families. Armada platform related files (docs,
plat, include/plat) are moved to the new "armada" sub-folder.
Change-Id: Icf03356187078ad6a2e56c9870992be3ca4c9655
Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
diff --git a/plat/marvell/a3700/a3700/platform.mk b/plat/marvell/a3700/a3700/platform.mk
deleted file mode 100644
index 4f7ac08..0000000
--- a/plat/marvell/a3700/a3700/platform.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2018 Marvell International Ltd.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# https://spdx.org/licenses
-#
-
-include plat/marvell/a3700/common/a3700_common.mk
-
-include plat/marvell/common/marvell_common.mk
diff --git a/plat/marvell/a8k/a70x0_amc/platform.mk b/plat/marvell/a8k/a70x0_amc/platform.mk
deleted file mode 100644
index d3a0167..0000000
--- a/plat/marvell/a8k/a70x0_amc/platform.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2018 Marvell International Ltd.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# https://spdx.org/licenses
-#
-
-PCI_EP_SUPPORT := 0
-
-CP_NUM := 1
-$(eval $(call add_define,CP_NUM))
-
-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/a3700/a3700/board/pm_src.c b/plat/marvell/armada/a3700/a3700/board/pm_src.c
similarity index 100%
rename from plat/marvell/a3700/a3700/board/pm_src.c
rename to plat/marvell/armada/a3700/a3700/board/pm_src.c
diff --git a/plat/marvell/a3700/a3700/mvebu_def.h b/plat/marvell/armada/a3700/a3700/mvebu_def.h
similarity index 100%
rename from plat/marvell/a3700/a3700/mvebu_def.h
rename to plat/marvell/armada/a3700/a3700/mvebu_def.h
diff --git a/plat/marvell/a3700/a3700/plat_bl31_setup.c b/plat/marvell/armada/a3700/a3700/plat_bl31_setup.c
similarity index 100%
rename from plat/marvell/a3700/a3700/plat_bl31_setup.c
rename to plat/marvell/armada/a3700/a3700/plat_bl31_setup.c
diff --git a/plat/marvell/armada/a3700/a3700/platform.mk b/plat/marvell/armada/a3700/a3700/platform.mk
new file mode 100644
index 0000000..bd9464a
--- /dev/null
+++ b/plat/marvell/armada/a3700/a3700/platform.mk
@@ -0,0 +1,10 @@
+#
+# Copyright (C) 2018 Marvell International Ltd.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# https://spdx.org/licenses
+#
+
+include plat/marvell/armada/a3700/common/a3700_common.mk
+
+include plat/marvell/armada/common/marvell_common.mk
diff --git a/plat/marvell/a3700/common/a3700_common.mk b/plat/marvell/armada/a3700/common/a3700_common.mk
similarity index 97%
rename from plat/marvell/a3700/common/a3700_common.mk
rename to plat/marvell/armada/a3700/common/a3700_common.mk
index 76c0677..36865a8 100644
--- a/plat/marvell/a3700/common/a3700_common.mk
+++ b/plat/marvell/armada/a3700/common/a3700_common.mk
@@ -5,8 +5,8 @@
# https://spdx.org/licenses
#
-MARVELL_PLAT_BASE := plat/marvell
-MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell
+MARVELL_PLAT_BASE := plat/marvell/armada
+MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell/armada
PLAT_FAMILY := a3700
PLAT_FAMILY_BASE := $(MARVELL_PLAT_BASE)/$(PLAT_FAMILY)
PLAT_INCLUDE_BASE := $(MARVELL_PLAT_INCLUDE_BASE)/$(PLAT_FAMILY)
@@ -15,7 +15,7 @@
MARVELL_COMMON_BASE := $(MARVELL_PLAT_BASE)/common
HANDLE_EA_EL3_FIRST := 1
-include $(MARVELL_PLAT_BASE)/marvell.mk
+include plat/marvell/marvell.mk
#*********** A3700 *************
DOIMAGEPATH := $(WTP)
diff --git a/plat/marvell/a3700/common/a3700_ea.c b/plat/marvell/armada/a3700/common/a3700_ea.c
similarity index 100%
rename from plat/marvell/a3700/common/a3700_ea.c
rename to plat/marvell/armada/a3700/common/a3700_ea.c
diff --git a/plat/marvell/a3700/common/a3700_sip_svc.c b/plat/marvell/armada/a3700/common/a3700_sip_svc.c
similarity index 100%
rename from plat/marvell/a3700/common/a3700_sip_svc.c
rename to plat/marvell/armada/a3700/common/a3700_sip_svc.c
diff --git a/plat/marvell/a3700/common/aarch64/a3700_common.c b/plat/marvell/armada/a3700/common/aarch64/a3700_common.c
similarity index 100%
rename from plat/marvell/a3700/common/aarch64/a3700_common.c
rename to plat/marvell/armada/a3700/common/aarch64/a3700_common.c
diff --git a/plat/marvell/a3700/common/aarch64/plat_helpers.S b/plat/marvell/armada/a3700/common/aarch64/plat_helpers.S
similarity index 100%
rename from plat/marvell/a3700/common/aarch64/plat_helpers.S
rename to plat/marvell/armada/a3700/common/aarch64/plat_helpers.S
diff --git a/plat/marvell/a3700/common/dram_win.c b/plat/marvell/armada/a3700/common/dram_win.c
similarity index 100%
rename from plat/marvell/a3700/common/dram_win.c
rename to plat/marvell/armada/a3700/common/dram_win.c
diff --git a/plat/marvell/a3700/common/include/a3700_plat_def.h b/plat/marvell/armada/a3700/common/include/a3700_plat_def.h
similarity index 100%
rename from plat/marvell/a3700/common/include/a3700_plat_def.h
rename to plat/marvell/armada/a3700/common/include/a3700_plat_def.h
diff --git a/plat/marvell/a3700/common/include/a3700_pm.h b/plat/marvell/armada/a3700/common/include/a3700_pm.h
similarity index 100%
rename from plat/marvell/a3700/common/include/a3700_pm.h
rename to plat/marvell/armada/a3700/common/include/a3700_pm.h
diff --git a/plat/marvell/a3700/common/include/ddr_info.h b/plat/marvell/armada/a3700/common/include/ddr_info.h
similarity index 100%
rename from plat/marvell/a3700/common/include/ddr_info.h
rename to plat/marvell/armada/a3700/common/include/ddr_info.h
diff --git a/plat/marvell/a3700/common/include/dram_win.h b/plat/marvell/armada/a3700/common/include/dram_win.h
similarity index 100%
rename from plat/marvell/a3700/common/include/dram_win.h
rename to plat/marvell/armada/a3700/common/include/dram_win.h
diff --git a/plat/marvell/a3700/common/include/io_addr_dec.h b/plat/marvell/armada/a3700/common/include/io_addr_dec.h
similarity index 100%
rename from plat/marvell/a3700/common/include/io_addr_dec.h
rename to plat/marvell/armada/a3700/common/include/io_addr_dec.h
diff --git a/plat/marvell/a3700/common/include/plat_macros.S b/plat/marvell/armada/a3700/common/include/plat_macros.S
similarity index 100%
rename from plat/marvell/a3700/common/include/plat_macros.S
rename to plat/marvell/armada/a3700/common/include/plat_macros.S
diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/armada/a3700/common/include/platform_def.h
similarity index 100%
rename from plat/marvell/a3700/common/include/platform_def.h
rename to plat/marvell/armada/a3700/common/include/platform_def.h
diff --git a/plat/marvell/a3700/common/io_addr_dec.c b/plat/marvell/armada/a3700/common/io_addr_dec.c
similarity index 100%
rename from plat/marvell/a3700/common/io_addr_dec.c
rename to plat/marvell/armada/a3700/common/io_addr_dec.c
diff --git a/plat/marvell/a3700/common/marvell_plat_config.c b/plat/marvell/armada/a3700/common/marvell_plat_config.c
similarity index 100%
rename from plat/marvell/a3700/common/marvell_plat_config.c
rename to plat/marvell/armada/a3700/common/marvell_plat_config.c
diff --git a/plat/marvell/a3700/common/plat_pm.c b/plat/marvell/armada/a3700/common/plat_pm.c
similarity index 100%
rename from plat/marvell/a3700/common/plat_pm.c
rename to plat/marvell/armada/a3700/common/plat_pm.c
diff --git a/plat/marvell/a8k/a70x0/board/dram_port.c b/plat/marvell/armada/a8k/a70x0/board/dram_port.c
similarity index 100%
rename from plat/marvell/a8k/a70x0/board/dram_port.c
rename to plat/marvell/armada/a8k/a70x0/board/dram_port.c
diff --git a/plat/marvell/a8k/a70x0/board/marvell_plat_config.c b/plat/marvell/armada/a8k/a70x0/board/marvell_plat_config.c
similarity index 100%
rename from plat/marvell/a8k/a70x0/board/marvell_plat_config.c
rename to plat/marvell/armada/a8k/a70x0/board/marvell_plat_config.c
diff --git a/plat/marvell/a8k/a70x0/mvebu_def.h b/plat/marvell/armada/a8k/a70x0/mvebu_def.h
similarity index 100%
rename from plat/marvell/a8k/a70x0/mvebu_def.h
rename to plat/marvell/armada/a8k/a70x0/mvebu_def.h
diff --git a/plat/marvell/a8k/a70x0/platform.mk b/plat/marvell/armada/a8k/a70x0/platform.mk
similarity index 74%
rename from plat/marvell/a8k/a70x0/platform.mk
rename to plat/marvell/armada/a8k/a70x0/platform.mk
index d3a0167..a77e349 100644
--- a/plat/marvell/a8k/a70x0/platform.mk
+++ b/plat/marvell/armada/a8k/a70x0/platform.mk
@@ -14,6 +14,6 @@
MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
-include plat/marvell/a8k/common/a8k_common.mk
+include plat/marvell/armada/a8k/common/a8k_common.mk
-include plat/marvell/common/marvell_common.mk
+include plat/marvell/armada/common/marvell_common.mk
diff --git a/plat/marvell/a8k/a70x0_amc/board/dram_port.c b/plat/marvell/armada/a8k/a70x0_amc/board/dram_port.c
similarity index 100%
rename from plat/marvell/a8k/a70x0_amc/board/dram_port.c
rename to plat/marvell/armada/a8k/a70x0_amc/board/dram_port.c
diff --git a/plat/marvell/a8k/a70x0_amc/board/marvell_plat_config.c b/plat/marvell/armada/a8k/a70x0_amc/board/marvell_plat_config.c
similarity index 100%
rename from plat/marvell/a8k/a70x0_amc/board/marvell_plat_config.c
rename to plat/marvell/armada/a8k/a70x0_amc/board/marvell_plat_config.c
diff --git a/plat/marvell/a8k/a70x0_amc/mvebu_def.h b/plat/marvell/armada/a8k/a70x0_amc/mvebu_def.h
similarity index 100%
rename from plat/marvell/a8k/a70x0_amc/mvebu_def.h
rename to plat/marvell/armada/a8k/a70x0_amc/mvebu_def.h
diff --git a/plat/marvell/a8k/a70x0/platform.mk b/plat/marvell/armada/a8k/a70x0_amc/platform.mk
similarity index 74%
copy from plat/marvell/a8k/a70x0/platform.mk
copy to plat/marvell/armada/a8k/a70x0_amc/platform.mk
index d3a0167..a77e349 100644
--- a/plat/marvell/a8k/a70x0/platform.mk
+++ b/plat/marvell/armada/a8k/a70x0_amc/platform.mk
@@ -14,6 +14,6 @@
MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
-include plat/marvell/a8k/common/a8k_common.mk
+include plat/marvell/armada/a8k/common/a8k_common.mk
-include plat/marvell/common/marvell_common.mk
+include plat/marvell/armada/common/marvell_common.mk
diff --git a/plat/marvell/a8k/a80x0/board/dram_port.c b/plat/marvell/armada/a8k/a80x0/board/dram_port.c
similarity index 100%
rename from plat/marvell/a8k/a80x0/board/dram_port.c
rename to plat/marvell/armada/a8k/a80x0/board/dram_port.c
diff --git a/plat/marvell/a8k/a80x0/board/marvell_plat_config.c b/plat/marvell/armada/a8k/a80x0/board/marvell_plat_config.c
similarity index 100%
rename from plat/marvell/a8k/a80x0/board/marvell_plat_config.c
rename to plat/marvell/armada/a8k/a80x0/board/marvell_plat_config.c
diff --git a/plat/marvell/a8k/a80x0/board/phy-porting-layer.h b/plat/marvell/armada/a8k/a80x0/board/phy-porting-layer.h
similarity index 100%
rename from plat/marvell/a8k/a80x0/board/phy-porting-layer.h
rename to plat/marvell/armada/a8k/a80x0/board/phy-porting-layer.h
diff --git a/plat/marvell/a8k/a80x0/mvebu_def.h b/plat/marvell/armada/a8k/a80x0/mvebu_def.h
similarity index 100%
rename from plat/marvell/a8k/a80x0/mvebu_def.h
rename to plat/marvell/armada/a8k/a80x0/mvebu_def.h
diff --git a/plat/marvell/a8k/a80x0/platform.mk b/plat/marvell/armada/a8k/a80x0/platform.mk
similarity index 66%
rename from plat/marvell/a8k/a80x0/platform.mk
rename to plat/marvell/armada/a8k/a80x0/platform.mk
index 00d24b2..56c4117 100644
--- a/plat/marvell/a8k/a80x0/platform.mk
+++ b/plat/marvell/armada/a8k/a80x0/platform.mk
@@ -14,7 +14,7 @@
MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
-include plat/marvell/a8k/common/a8k_common.mk
+include plat/marvell/armada/a8k/common/a8k_common.mk
-include plat/marvell/common/marvell_common.mk
-PLAT_INCLUDES += -Iplat/marvell/a8k/a80x0/board
+include plat/marvell/armada/common/marvell_common.mk
+PLAT_INCLUDES += -Iplat/marvell/armada/a8k/a80x0/board
diff --git a/plat/marvell/a8k/a80x0_mcbin/board/dram_port.c b/plat/marvell/armada/a8k/a80x0_mcbin/board/dram_port.c
similarity index 100%
rename from plat/marvell/a8k/a80x0_mcbin/board/dram_port.c
rename to plat/marvell/armada/a8k/a80x0_mcbin/board/dram_port.c
diff --git a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c b/plat/marvell/armada/a8k/a80x0_mcbin/board/marvell_plat_config.c
similarity index 100%
rename from plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
rename to plat/marvell/armada/a8k/a80x0_mcbin/board/marvell_plat_config.c
diff --git a/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h b/plat/marvell/armada/a8k/a80x0_mcbin/mvebu_def.h
similarity index 100%
rename from plat/marvell/a8k/a80x0_mcbin/mvebu_def.h
rename to plat/marvell/armada/a8k/a80x0_mcbin/mvebu_def.h
diff --git a/plat/marvell/a8k/a80x0_mcbin/platform.mk b/plat/marvell/armada/a8k/a80x0_mcbin/platform.mk
similarity index 74%
rename from plat/marvell/a8k/a80x0_mcbin/platform.mk
rename to plat/marvell/armada/a8k/a80x0_mcbin/platform.mk
index 3749c37..d962b3d 100644
--- a/plat/marvell/a8k/a80x0_mcbin/platform.mk
+++ b/plat/marvell/armada/a8k/a80x0_mcbin/platform.mk
@@ -14,6 +14,6 @@
MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c
-include plat/marvell/a8k/common/a8k_common.mk
+include plat/marvell/armada/a8k/common/a8k_common.mk
-include plat/marvell/common/marvell_common.mk
+include plat/marvell/armada/common/marvell_common.mk
diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/armada/a8k/common/a8k_common.mk
similarity index 95%
rename from plat/marvell/a8k/common/a8k_common.mk
rename to plat/marvell/armada/a8k/common/a8k_common.mk
index 1ff28f8..471bc82 100644
--- a/plat/marvell/a8k/common/a8k_common.mk
+++ b/plat/marvell/armada/a8k/common/a8k_common.mk
@@ -7,11 +7,11 @@
include tools/marvell/doimage/doimage.mk
PLAT_FAMILY := a8k
-PLAT_FAMILY_BASE := plat/marvell/$(PLAT_FAMILY)
-PLAT_INCLUDE_BASE := include/plat/marvell/$(PLAT_FAMILY)
+PLAT_FAMILY_BASE := plat/marvell/armada/$(PLAT_FAMILY)
+PLAT_INCLUDE_BASE := include/plat/marvell/armada/$(PLAT_FAMILY)
PLAT_COMMON_BASE := $(PLAT_FAMILY_BASE)/common
MARVELL_DRV_BASE := drivers/marvell
-MARVELL_COMMON_BASE := plat/marvell/common
+MARVELL_COMMON_BASE := plat/marvell/armada/common
MARVELL_SVC_TEST := 0
$(eval $(call add_define,MARVELL_SVC_TEST))
diff --git a/plat/marvell/a8k/common/aarch64/a8k_common.c b/plat/marvell/armada/a8k/common/aarch64/a8k_common.c
similarity index 100%
rename from plat/marvell/a8k/common/aarch64/a8k_common.c
rename to plat/marvell/armada/a8k/common/aarch64/a8k_common.c
diff --git a/plat/marvell/a8k/common/aarch64/plat_arch_config.c b/plat/marvell/armada/a8k/common/aarch64/plat_arch_config.c
similarity index 100%
rename from plat/marvell/a8k/common/aarch64/plat_arch_config.c
rename to plat/marvell/armada/a8k/common/aarch64/plat_arch_config.c
diff --git a/plat/marvell/a8k/common/aarch64/plat_helpers.S b/plat/marvell/armada/a8k/common/aarch64/plat_helpers.S
similarity index 100%
rename from plat/marvell/a8k/common/aarch64/plat_helpers.S
rename to plat/marvell/armada/a8k/common/aarch64/plat_helpers.S
diff --git a/plat/marvell/a8k/common/ble/ble.ld.S b/plat/marvell/armada/a8k/common/ble/ble.ld.S
similarity index 100%
rename from plat/marvell/a8k/common/ble/ble.ld.S
rename to plat/marvell/armada/a8k/common/ble/ble.ld.S
diff --git a/plat/marvell/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
similarity index 96%
rename from plat/marvell/a8k/common/ble/ble.mk
rename to plat/marvell/armada/a8k/common/ble/ble.mk
index b6a9cd2..82ac098 100644
--- a/plat/marvell/a8k/common/ble/ble.mk
+++ b/plat/marvell/armada/a8k/common/ble/ble.mk
@@ -8,7 +8,7 @@
MV_DDR_LIB = $(CURDIR)/$(BUILD_PLAT)/ble/mv_ddr_lib.a
LIBC_LIB = $(CURDIR)/$(BUILD_PLAT)/lib/libc.a
BLE_LIBS = $(MV_DDR_LIB) $(LIBC_LIB)
-PLAT_MARVELL = plat/marvell
+PLAT_MARVELL = plat/marvell/armada
BLE_SOURCES += $(BLE_PATH)/ble_main.c \
$(BLE_PATH)/ble_mem.S \
diff --git a/plat/marvell/a8k/common/ble/ble_main.c b/plat/marvell/armada/a8k/common/ble/ble_main.c
similarity index 100%
rename from plat/marvell/a8k/common/ble/ble_main.c
rename to plat/marvell/armada/a8k/common/ble/ble_main.c
diff --git a/plat/marvell/a8k/common/ble/ble_mem.S b/plat/marvell/armada/a8k/common/ble/ble_mem.S
similarity index 100%
rename from plat/marvell/a8k/common/ble/ble_mem.S
rename to plat/marvell/armada/a8k/common/ble/ble_mem.S
diff --git a/plat/marvell/a8k/common/include/a8k_plat_def.h b/plat/marvell/armada/a8k/common/include/a8k_plat_def.h
similarity index 100%
rename from plat/marvell/a8k/common/include/a8k_plat_def.h
rename to plat/marvell/armada/a8k/common/include/a8k_plat_def.h
diff --git a/plat/marvell/a8k/common/include/ddr_info.h b/plat/marvell/armada/a8k/common/include/ddr_info.h
similarity index 100%
rename from plat/marvell/a8k/common/include/ddr_info.h
rename to plat/marvell/armada/a8k/common/include/ddr_info.h
diff --git a/plat/marvell/a8k/common/include/mentor_i2c_plat.h b/plat/marvell/armada/a8k/common/include/mentor_i2c_plat.h
similarity index 100%
rename from plat/marvell/a8k/common/include/mentor_i2c_plat.h
rename to plat/marvell/armada/a8k/common/include/mentor_i2c_plat.h
diff --git a/plat/marvell/a8k/common/include/plat_macros.S b/plat/marvell/armada/a8k/common/include/plat_macros.S
similarity index 100%
rename from plat/marvell/a8k/common/include/plat_macros.S
rename to plat/marvell/armada/a8k/common/include/plat_macros.S
diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/armada/a8k/common/include/platform_def.h
similarity index 100%
rename from plat/marvell/a8k/common/include/platform_def.h
rename to plat/marvell/armada/a8k/common/include/platform_def.h
diff --git a/plat/marvell/a8k/common/mss/mss_a8k.mk b/plat/marvell/armada/a8k/common/mss/mss_a8k.mk
similarity index 92%
rename from plat/marvell/a8k/common/mss/mss_a8k.mk
rename to plat/marvell/armada/a8k/common/mss/mss_a8k.mk
index efd03c5..d8d4921 100644
--- a/plat/marvell/a8k/common/mss/mss_a8k.mk
+++ b/plat/marvell/armada/a8k/common/mss/mss_a8k.mk
@@ -5,7 +5,7 @@
# https://spdx.org/licenses
#
-PLAT_MARVELL := plat/marvell
+PLAT_MARVELL := plat/marvell/armada
A8K_MSS_SOURCE := $(PLAT_MARVELL)/a8k/common/mss
BL2_SOURCES += $(A8K_MSS_SOURCE)/mss_bl2_setup.c \
diff --git a/plat/marvell/a8k/common/mss/mss_bl2_setup.c b/plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c
similarity index 100%
rename from plat/marvell/a8k/common/mss/mss_bl2_setup.c
rename to plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c
diff --git a/plat/marvell/a8k/common/mss/mss_pm_ipc.c b/plat/marvell/armada/a8k/common/mss/mss_pm_ipc.c
similarity index 100%
rename from plat/marvell/a8k/common/mss/mss_pm_ipc.c
rename to plat/marvell/armada/a8k/common/mss/mss_pm_ipc.c
diff --git a/plat/marvell/a8k/common/mss/mss_pm_ipc.h b/plat/marvell/armada/a8k/common/mss/mss_pm_ipc.h
similarity index 100%
rename from plat/marvell/a8k/common/mss/mss_pm_ipc.h
rename to plat/marvell/armada/a8k/common/mss/mss_pm_ipc.h
diff --git a/plat/marvell/a8k/common/plat_bl1_setup.c b/plat/marvell/armada/a8k/common/plat_bl1_setup.c
similarity index 100%
rename from plat/marvell/a8k/common/plat_bl1_setup.c
rename to plat/marvell/armada/a8k/common/plat_bl1_setup.c
diff --git a/plat/marvell/a8k/common/plat_bl31_setup.c b/plat/marvell/armada/a8k/common/plat_bl31_setup.c
similarity index 100%
rename from plat/marvell/a8k/common/plat_bl31_setup.c
rename to plat/marvell/armada/a8k/common/plat_bl31_setup.c
diff --git a/plat/marvell/a8k/common/plat_ble_setup.c b/plat/marvell/armada/a8k/common/plat_ble_setup.c
similarity index 100%
rename from plat/marvell/a8k/common/plat_ble_setup.c
rename to plat/marvell/armada/a8k/common/plat_ble_setup.c
diff --git a/plat/marvell/a8k/common/plat_pm.c b/plat/marvell/armada/a8k/common/plat_pm.c
similarity index 100%
rename from plat/marvell/a8k/common/plat_pm.c
rename to plat/marvell/armada/a8k/common/plat_pm.c
diff --git a/plat/marvell/a8k/common/plat_pm_trace.c b/plat/marvell/armada/a8k/common/plat_pm_trace.c
similarity index 100%
rename from plat/marvell/a8k/common/plat_pm_trace.c
rename to plat/marvell/armada/a8k/common/plat_pm_trace.c
diff --git a/plat/marvell/a8k/common/plat_thermal.c b/plat/marvell/armada/a8k/common/plat_thermal.c
similarity index 100%
rename from plat/marvell/a8k/common/plat_thermal.c
rename to plat/marvell/armada/a8k/common/plat_thermal.c
diff --git a/plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c b/plat/marvell/armada/common/aarch64/marvell_bl2_mem_params_desc.c
similarity index 100%
rename from plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c
rename to plat/marvell/armada/common/aarch64/marvell_bl2_mem_params_desc.c
diff --git a/plat/marvell/common/aarch64/marvell_common.c b/plat/marvell/armada/common/aarch64/marvell_common.c
similarity index 100%
rename from plat/marvell/common/aarch64/marvell_common.c
rename to plat/marvell/armada/common/aarch64/marvell_common.c
diff --git a/plat/marvell/common/aarch64/marvell_helpers.S b/plat/marvell/armada/common/aarch64/marvell_helpers.S
similarity index 100%
rename from plat/marvell/common/aarch64/marvell_helpers.S
rename to plat/marvell/armada/common/aarch64/marvell_helpers.S
diff --git a/plat/marvell/common/marvell_bl1_setup.c b/plat/marvell/armada/common/marvell_bl1_setup.c
similarity index 100%
rename from plat/marvell/common/marvell_bl1_setup.c
rename to plat/marvell/armada/common/marvell_bl1_setup.c
diff --git a/plat/marvell/common/marvell_bl2_setup.c b/plat/marvell/armada/common/marvell_bl2_setup.c
similarity index 100%
rename from plat/marvell/common/marvell_bl2_setup.c
rename to plat/marvell/armada/common/marvell_bl2_setup.c
diff --git a/plat/marvell/common/marvell_bl31_setup.c b/plat/marvell/armada/common/marvell_bl31_setup.c
similarity index 100%
rename from plat/marvell/common/marvell_bl31_setup.c
rename to plat/marvell/armada/common/marvell_bl31_setup.c
diff --git a/plat/marvell/common/marvell_cci.c b/plat/marvell/armada/common/marvell_cci.c
similarity index 100%
rename from plat/marvell/common/marvell_cci.c
rename to plat/marvell/armada/common/marvell_cci.c
diff --git a/plat/marvell/common/marvell_common.mk b/plat/marvell/armada/common/marvell_common.mk
similarity index 92%
rename from plat/marvell/common/marvell_common.mk
rename to plat/marvell/armada/common/marvell_common.mk
index f41d7a4..f5f0c41 100644
--- a/plat/marvell/common/marvell_common.mk
+++ b/plat/marvell/armada/common/marvell_common.mk
@@ -3,11 +3,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# https://spdx.org/licenses
-MARVELL_PLAT_BASE := plat/marvell
-MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell
+MARVELL_PLAT_BASE := plat/marvell/armada
+MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell/armada
-include $(MARVELL_PLAT_BASE)/version.mk
-include $(MARVELL_PLAT_BASE)/marvell.mk
+include plat/marvell/version.mk
+include plat/marvell/marvell.mk
VERSION_STRING +=(Marvell-${SUBVERSION})
diff --git a/plat/marvell/common/marvell_console.c b/plat/marvell/armada/common/marvell_console.c
similarity index 100%
rename from plat/marvell/common/marvell_console.c
rename to plat/marvell/armada/common/marvell_console.c
diff --git a/plat/marvell/common/marvell_ddr_info.c b/plat/marvell/armada/common/marvell_ddr_info.c
similarity index 100%
rename from plat/marvell/common/marvell_ddr_info.c
rename to plat/marvell/armada/common/marvell_ddr_info.c
diff --git a/plat/marvell/common/marvell_gicv2.c b/plat/marvell/armada/common/marvell_gicv2.c
similarity index 100%
rename from plat/marvell/common/marvell_gicv2.c
rename to plat/marvell/armada/common/marvell_gicv2.c
diff --git a/plat/marvell/common/marvell_gicv3.c b/plat/marvell/armada/common/marvell_gicv3.c
similarity index 100%
rename from plat/marvell/common/marvell_gicv3.c
rename to plat/marvell/armada/common/marvell_gicv3.c
diff --git a/plat/marvell/common/marvell_image_load.c b/plat/marvell/armada/common/marvell_image_load.c
similarity index 100%
rename from plat/marvell/common/marvell_image_load.c
rename to plat/marvell/armada/common/marvell_image_load.c
diff --git a/plat/marvell/common/marvell_io_storage.c b/plat/marvell/armada/common/marvell_io_storage.c
similarity index 100%
rename from plat/marvell/common/marvell_io_storage.c
rename to plat/marvell/armada/common/marvell_io_storage.c
diff --git a/plat/marvell/common/marvell_pm.c b/plat/marvell/armada/common/marvell_pm.c
similarity index 100%
rename from plat/marvell/common/marvell_pm.c
rename to plat/marvell/armada/common/marvell_pm.c
diff --git a/plat/marvell/common/marvell_topology.c b/plat/marvell/armada/common/marvell_topology.c
similarity index 100%
rename from plat/marvell/common/marvell_topology.c
rename to plat/marvell/armada/common/marvell_topology.c
diff --git a/plat/marvell/common/mrvl_sip_svc.c b/plat/marvell/armada/common/mrvl_sip_svc.c
similarity index 100%
rename from plat/marvell/common/mrvl_sip_svc.c
rename to plat/marvell/armada/common/mrvl_sip_svc.c
diff --git a/plat/marvell/common/mss/mss_common.mk b/plat/marvell/armada/common/mss/mss_common.mk
similarity index 92%
rename from plat/marvell/common/mss/mss_common.mk
rename to plat/marvell/armada/common/mss/mss_common.mk
index 898b6dc..050d88d 100644
--- a/plat/marvell/common/mss/mss_common.mk
+++ b/plat/marvell/armada/common/mss/mss_common.mk
@@ -6,7 +6,7 @@
#
-PLAT_MARVELL := plat/marvell
+PLAT_MARVELL := plat/marvell/armada
MSS_SOURCE := $(PLAT_MARVELL)/common/mss
BL2_SOURCES += $(MSS_SOURCE)/mss_scp_bootloader.c \
diff --git a/plat/marvell/common/mss/mss_ipc_drv.c b/plat/marvell/armada/common/mss/mss_ipc_drv.c
similarity index 100%
rename from plat/marvell/common/mss/mss_ipc_drv.c
rename to plat/marvell/armada/common/mss/mss_ipc_drv.c
diff --git a/plat/marvell/common/mss/mss_ipc_drv.h b/plat/marvell/armada/common/mss/mss_ipc_drv.h
similarity index 100%
rename from plat/marvell/common/mss/mss_ipc_drv.h
rename to plat/marvell/armada/common/mss/mss_ipc_drv.h
diff --git a/plat/marvell/common/mss/mss_mem.h b/plat/marvell/armada/common/mss/mss_mem.h
similarity index 100%
rename from plat/marvell/common/mss/mss_mem.h
rename to plat/marvell/armada/common/mss/mss_mem.h
diff --git a/plat/marvell/common/mss/mss_scp_bl2_format.h b/plat/marvell/armada/common/mss/mss_scp_bl2_format.h
similarity index 100%
rename from plat/marvell/common/mss/mss_scp_bl2_format.h
rename to plat/marvell/armada/common/mss/mss_scp_bl2_format.h
diff --git a/plat/marvell/common/mss/mss_scp_bootloader.c b/plat/marvell/armada/common/mss/mss_scp_bootloader.c
similarity index 100%
rename from plat/marvell/common/mss/mss_scp_bootloader.c
rename to plat/marvell/armada/common/mss/mss_scp_bootloader.c
diff --git a/plat/marvell/common/mss/mss_scp_bootloader.h b/plat/marvell/armada/common/mss/mss_scp_bootloader.h
similarity index 100%
rename from plat/marvell/common/mss/mss_scp_bootloader.h
rename to plat/marvell/armada/common/mss/mss_scp_bootloader.h
diff --git a/plat/marvell/common/plat_delay_timer.c b/plat/marvell/armada/common/plat_delay_timer.c
similarity index 100%
rename from plat/marvell/common/plat_delay_timer.c
rename to plat/marvell/armada/common/plat_delay_timer.c