From 3e4b8fdcd3794ca07135521a5fd4c3141624f17c Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Fri, 8 Apr 2016 16:42:58 +0100 Subject: [PATCH] Migrate platform ports to the new xlat_tables library This patch modifies the upstream platform port makefiles to use the new xlat_tables library files. This patch also makes mmap region setup common between AArch64 and AArch32 for FVP platform port. The file `fvp_common.c` is moved from the `plat/arm/board/fvp/aarch64` folder to the parent folder as it is not specific to AArch64. Change-Id: Id2e9aac45e46227b6f83cccfd1e915404018ea0b --- plat/arm/board/fvp/{aarch64 => }/fvp_common.c | 0 plat/arm/board/fvp/platform.mk | 2 +- plat/arm/common/arm_common.mk | 3 ++- plat/mediatek/mt8173/platform.mk | 3 ++- plat/nvidia/tegra/common/tegra_common.mk | 3 ++- plat/rockchip/rk3368/platform.mk | 3 ++- plat/rockchip/rk3399/platform.mk | 3 ++- plat/xilinx/zynqmp/platform.mk | 3 ++- 8 files changed, 13 insertions(+), 7 deletions(-) rename plat/arm/board/fvp/{aarch64 => }/fvp_common.c (100%) diff --git a/plat/arm/board/fvp/aarch64/fvp_common.c b/plat/arm/board/fvp/fvp_common.c similarity index 100% rename from plat/arm/board/fvp/aarch64/fvp_common.c rename to plat/arm/board/fvp/fvp_common.c diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index afd939d14..60ebe65b5 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -73,7 +73,7 @@ FVP_SECURITY_SOURCES := drivers/arm/tzc/tzc400.c \ PLAT_INCLUDES := -Iplat/arm/board/fvp/include -PLAT_BL_COMMON_SOURCES := plat/arm/board/fvp/aarch64/fvp_common.c +PLAT_BL_COMMON_SOURCES := plat/arm/board/fvp/fvp_common.c FVP_CPU_LIBS := lib/cpus/aarch64/aem_generic.S \ lib/cpus/aarch64/cortex_a35.S \ diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 973e583e2..0b2886176 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -87,7 +87,8 @@ PLAT_INCLUDES += -Iinclude/common/tbbr \ -Iinclude/plat/arm/common/aarch64 -PLAT_BL_COMMON_SOURCES += lib/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES += lib/xlat_tables/xlat_tables_common.c \ + lib/xlat_tables/aarch64/xlat_tables.c \ plat/arm/common/aarch64/arm_common.c \ plat/arm/common/aarch64/arm_helpers.S \ plat/common/aarch64/plat_common.c diff --git a/plat/mediatek/mt8173/platform.mk b/plat/mediatek/mt8173/platform.mk index 4169823f5..f0451b92c 100644 --- a/plat/mediatek/mt8173/platform.mk +++ b/plat/mediatek/mt8173/platform.mk @@ -40,7 +40,8 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ -I${MTK_PLAT_SOC}/drivers/uart/ \ -I${MTK_PLAT_SOC}/include/ -PLAT_BL_COMMON_SOURCES := lib/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ + lib/xlat_tables/aarch64/xlat_tables.c \ plat/common/aarch64/plat_common.c \ plat/common/plat_gic.c diff --git a/plat/nvidia/tegra/common/tegra_common.mk b/plat/nvidia/tegra/common/tegra_common.mk index fcebde303..2ecf5f5e7 100644 --- a/plat/nvidia/tegra/common/tegra_common.mk +++ b/plat/nvidia/tegra/common/tegra_common.mk @@ -40,7 +40,8 @@ PLAT_INCLUDES := -Iplat/nvidia/tegra/include/drivers \ -Iplat/nvidia/tegra/include \ -Iplat/nvidia/tegra/include/${TARGET_SOC} -PLAT_BL_COMMON_SOURCES := lib/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ + lib/xlat_tables/aarch64/xlat_tables.c \ plat/common/aarch64/plat_common.c COMMON_DIR := plat/nvidia/tegra/common diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index 4fadf218d..0d34cf4e0 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -48,7 +48,8 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ plat/common/plat_gicv2.c \ ${RK_PLAT}/common/rockchip_gicv2.c -PLAT_BL_COMMON_SOURCES := lib/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ + lib/xlat_tables/aarch64/xlat_tables.c \ plat/common/aarch64/plat_common.c \ plat/common/aarch64/plat_psci_common.c diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk index 78517263f..6d7e13470 100644 --- a/plat/rockchip/rk3399/platform.mk +++ b/plat/rockchip/rk3399/platform.mk @@ -47,7 +47,8 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ plat/common/plat_gicv3.c \ ${RK_PLAT}/common/rockchip_gicv3.c -PLAT_BL_COMMON_SOURCES := lib/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ + lib/xlat_tables/aarch64/xlat_tables.c \ plat/common/aarch64/plat_common.c \ plat/common/aarch64/plat_psci_common.c diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index 0ffc0a9ca..febff29f4 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -60,7 +60,8 @@ PLAT_INCLUDES := -Iinclude/plat/arm/common/ \ -Iplat/xilinx/zynqmp/include/ \ -Iplat/xilinx/zynqmp/pm_service/ -PLAT_BL_COMMON_SOURCES := lib/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ + lib/xlat_tables/aarch64/xlat_tables.c \ drivers/arm/gic/common/gic_common.c \ drivers/arm/gic/v2/gicv2_main.c \ drivers/arm/gic/v2/gicv2_helpers.c \ -- GitLab