Commit 3e4b8fdc authored by Soby Mathew's avatar Soby Mathew
Browse files

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
parent 3ca9928d
...@@ -73,7 +73,7 @@ FVP_SECURITY_SOURCES := drivers/arm/tzc/tzc400.c \ ...@@ -73,7 +73,7 @@ FVP_SECURITY_SOURCES := drivers/arm/tzc/tzc400.c \
PLAT_INCLUDES := -Iplat/arm/board/fvp/include 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 \ FVP_CPU_LIBS := lib/cpus/aarch64/aem_generic.S \
lib/cpus/aarch64/cortex_a35.S \ lib/cpus/aarch64/cortex_a35.S \
......
...@@ -87,7 +87,8 @@ PLAT_INCLUDES += -Iinclude/common/tbbr \ ...@@ -87,7 +87,8 @@ PLAT_INCLUDES += -Iinclude/common/tbbr \
-Iinclude/plat/arm/common/aarch64 -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_common.c \
plat/arm/common/aarch64/arm_helpers.S \ plat/arm/common/aarch64/arm_helpers.S \
plat/common/aarch64/plat_common.c plat/common/aarch64/plat_common.c
......
...@@ -40,7 +40,8 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ ...@@ -40,7 +40,8 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \
-I${MTK_PLAT_SOC}/drivers/uart/ \ -I${MTK_PLAT_SOC}/drivers/uart/ \
-I${MTK_PLAT_SOC}/include/ -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/aarch64/plat_common.c \
plat/common/plat_gic.c plat/common/plat_gic.c
......
...@@ -40,7 +40,8 @@ PLAT_INCLUDES := -Iplat/nvidia/tegra/include/drivers \ ...@@ -40,7 +40,8 @@ PLAT_INCLUDES := -Iplat/nvidia/tegra/include/drivers \
-Iplat/nvidia/tegra/include \ -Iplat/nvidia/tegra/include \
-Iplat/nvidia/tegra/include/${TARGET_SOC} -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 plat/common/aarch64/plat_common.c
COMMON_DIR := plat/nvidia/tegra/common COMMON_DIR := plat/nvidia/tegra/common
......
...@@ -48,7 +48,8 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ ...@@ -48,7 +48,8 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
plat/common/plat_gicv2.c \ plat/common/plat_gicv2.c \
${RK_PLAT}/common/rockchip_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_common.c \
plat/common/aarch64/plat_psci_common.c plat/common/aarch64/plat_psci_common.c
......
...@@ -47,7 +47,8 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ ...@@ -47,7 +47,8 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
plat/common/plat_gicv3.c \ plat/common/plat_gicv3.c \
${RK_PLAT}/common/rockchip_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_common.c \
plat/common/aarch64/plat_psci_common.c plat/common/aarch64/plat_psci_common.c
......
...@@ -60,7 +60,8 @@ PLAT_INCLUDES := -Iinclude/plat/arm/common/ \ ...@@ -60,7 +60,8 @@ PLAT_INCLUDES := -Iinclude/plat/arm/common/ \
-Iplat/xilinx/zynqmp/include/ \ -Iplat/xilinx/zynqmp/include/ \
-Iplat/xilinx/zynqmp/pm_service/ -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/common/gic_common.c \
drivers/arm/gic/v2/gicv2_main.c \ drivers/arm/gic/v2/gicv2_main.c \
drivers/arm/gic/v2/gicv2_helpers.c \ drivers/arm/gic/v2/gicv2_helpers.c \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment