diff --git a/include/plat/marvell/armada/a3700/common/armada_common.h b/include/plat/marvell/armada/a3k/common/armada_common.h similarity index 100% rename from include/plat/marvell/armada/a3700/common/armada_common.h rename to include/plat/marvell/armada/a3k/common/armada_common.h diff --git a/include/plat/marvell/armada/a3700/common/board_marvell_def.h b/include/plat/marvell/armada/a3k/common/board_marvell_def.h similarity index 100% rename from include/plat/marvell/armada/a3700/common/board_marvell_def.h rename to include/plat/marvell/armada/a3k/common/board_marvell_def.h diff --git a/include/plat/marvell/armada/a3700/common/marvell_def.h b/include/plat/marvell/armada/a3k/common/marvell_def.h similarity index 100% rename from include/plat/marvell/armada/a3700/common/marvell_def.h rename to include/plat/marvell/armada/a3k/common/marvell_def.h diff --git a/include/plat/marvell/armada/a3700/common/plat_marvell.h b/include/plat/marvell/armada/a3k/common/plat_marvell.h similarity index 100% rename from include/plat/marvell/armada/a3700/common/plat_marvell.h rename to include/plat/marvell/armada/a3k/common/plat_marvell.h diff --git a/plat/marvell/armada/a3700/a3700/board/pm_src.c b/plat/marvell/armada/a3k/a3700/board/pm_src.c similarity index 100% rename from plat/marvell/armada/a3700/a3700/board/pm_src.c rename to plat/marvell/armada/a3k/a3700/board/pm_src.c diff --git a/plat/marvell/armada/a3700/a3700/mvebu_def.h b/plat/marvell/armada/a3k/a3700/mvebu_def.h similarity index 100% rename from plat/marvell/armada/a3700/a3700/mvebu_def.h rename to plat/marvell/armada/a3k/a3700/mvebu_def.h diff --git a/plat/marvell/armada/a3700/a3700/plat_bl31_setup.c b/plat/marvell/armada/a3k/a3700/plat_bl31_setup.c similarity index 100% rename from plat/marvell/armada/a3700/a3700/plat_bl31_setup.c rename to plat/marvell/armada/a3k/a3700/plat_bl31_setup.c diff --git a/plat/marvell/armada/a3700/a3700/platform.mk b/plat/marvell/armada/a3k/a3700/platform.mk similarity index 75% rename from plat/marvell/armada/a3700/a3700/platform.mk rename to plat/marvell/armada/a3k/a3700/platform.mk index bd9464aae..050af4199 100644 --- a/plat/marvell/armada/a3700/a3700/platform.mk +++ b/plat/marvell/armada/a3k/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 diff --git a/plat/marvell/armada/a3700/common/a3700_common.mk b/plat/marvell/armada/a3k/common/a3700_common.mk similarity index 99% rename from plat/marvell/armada/a3700/common/a3700_common.mk rename to plat/marvell/armada/a3k/common/a3700_common.mk index 36865a896..996556719 100644 --- a/plat/marvell/armada/a3700/common/a3700_common.mk +++ b/plat/marvell/armada/a3k/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 diff --git a/plat/marvell/armada/a3700/common/a3700_ea.c b/plat/marvell/armada/a3k/common/a3700_ea.c similarity index 100% rename from plat/marvell/armada/a3700/common/a3700_ea.c rename to plat/marvell/armada/a3k/common/a3700_ea.c diff --git a/plat/marvell/armada/a3700/common/a3700_sip_svc.c b/plat/marvell/armada/a3k/common/a3700_sip_svc.c similarity index 100% rename from plat/marvell/armada/a3700/common/a3700_sip_svc.c rename to plat/marvell/armada/a3k/common/a3700_sip_svc.c diff --git a/plat/marvell/armada/a3700/common/aarch64/a3700_common.c b/plat/marvell/armada/a3k/common/aarch64/a3700_common.c similarity index 100% rename from plat/marvell/armada/a3700/common/aarch64/a3700_common.c rename to plat/marvell/armada/a3k/common/aarch64/a3700_common.c diff --git a/plat/marvell/armada/a3700/common/aarch64/plat_helpers.S b/plat/marvell/armada/a3k/common/aarch64/plat_helpers.S similarity index 100% rename from plat/marvell/armada/a3700/common/aarch64/plat_helpers.S rename to plat/marvell/armada/a3k/common/aarch64/plat_helpers.S diff --git a/plat/marvell/armada/a3700/common/dram_win.c b/plat/marvell/armada/a3k/common/dram_win.c similarity index 100% rename from plat/marvell/armada/a3700/common/dram_win.c rename to plat/marvell/armada/a3k/common/dram_win.c diff --git a/plat/marvell/armada/a3700/common/include/a3700_plat_def.h b/plat/marvell/armada/a3k/common/include/a3700_plat_def.h similarity index 100% rename from plat/marvell/armada/a3700/common/include/a3700_plat_def.h rename to plat/marvell/armada/a3k/common/include/a3700_plat_def.h diff --git a/plat/marvell/armada/a3700/common/include/a3700_pm.h b/plat/marvell/armada/a3k/common/include/a3700_pm.h similarity index 100% rename from plat/marvell/armada/a3700/common/include/a3700_pm.h rename to plat/marvell/armada/a3k/common/include/a3700_pm.h diff --git a/plat/marvell/armada/a3700/common/include/ddr_info.h b/plat/marvell/armada/a3k/common/include/ddr_info.h similarity index 100% rename from plat/marvell/armada/a3700/common/include/ddr_info.h rename to plat/marvell/armada/a3k/common/include/ddr_info.h diff --git a/plat/marvell/armada/a3700/common/include/dram_win.h b/plat/marvell/armada/a3k/common/include/dram_win.h similarity index 100% rename from plat/marvell/armada/a3700/common/include/dram_win.h rename to plat/marvell/armada/a3k/common/include/dram_win.h diff --git a/plat/marvell/armada/a3700/common/include/io_addr_dec.h b/plat/marvell/armada/a3k/common/include/io_addr_dec.h similarity index 100% rename from plat/marvell/armada/a3700/common/include/io_addr_dec.h rename to plat/marvell/armada/a3k/common/include/io_addr_dec.h diff --git a/plat/marvell/armada/a3700/common/include/plat_macros.S b/plat/marvell/armada/a3k/common/include/plat_macros.S similarity index 100% rename from plat/marvell/armada/a3700/common/include/plat_macros.S rename to plat/marvell/armada/a3k/common/include/plat_macros.S diff --git a/plat/marvell/armada/a3700/common/include/platform_def.h b/plat/marvell/armada/a3k/common/include/platform_def.h similarity index 100% rename from plat/marvell/armada/a3700/common/include/platform_def.h rename to plat/marvell/armada/a3k/common/include/platform_def.h diff --git a/plat/marvell/armada/a3700/common/io_addr_dec.c b/plat/marvell/armada/a3k/common/io_addr_dec.c similarity index 100% rename from plat/marvell/armada/a3700/common/io_addr_dec.c rename to plat/marvell/armada/a3k/common/io_addr_dec.c diff --git a/plat/marvell/armada/a3700/common/marvell_plat_config.c b/plat/marvell/armada/a3k/common/marvell_plat_config.c similarity index 100% rename from plat/marvell/armada/a3700/common/marvell_plat_config.c rename to plat/marvell/armada/a3k/common/marvell_plat_config.c diff --git a/plat/marvell/armada/a3700/common/plat_pm.c b/plat/marvell/armada/a3k/common/plat_pm.c similarity index 100% rename from plat/marvell/armada/a3700/common/plat_pm.c rename to plat/marvell/armada/a3k/common/plat_pm.c