From 7d6ad6468eb8e510f34d3f980424241682c13446 Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Thu, 20 Feb 2020 23:47:21 +0800 Subject: MA-16438 plat:imx8/imx8m: switch to xlat_tables_v2 spd trusty requires memory dynamic mapping feature to be enabled, so we have to use xlat table library v2 instead of v1. Test: builds. Signed-off-by: Ji Luo --- plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 +- plat/imx/imx8m/imx8mm/platform.mk | 10 ++++++++-- plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 +- plat/imx/imx8m/imx8mn/platform.mk | 10 ++++++++-- plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 2 +- plat/imx/imx8m/imx8mq/platform.mk | 10 ++++++++-- plat/imx/imx8qm/imx8qm_bl31_setup.c | 2 +- plat/imx/imx8qm/platform.mk | 10 ++++++++-- plat/imx/imx8qx/imx8qx_bl31_setup.c | 2 +- plat/imx/imx8qx/platform.mk | 10 ++++++++-- 10 files changed, 45 insertions(+), 15 deletions(-) diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c index e649e4b6..095cf144 100644 --- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk index 968d3a5f..600a3c44 100644 --- a/plat/imx/imx8m/imx8mm/platform.mk +++ b/plat/imx/imx8m/imx8mm/platform.mk @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: BSD-3-Clause # +# +# Translation tables library +include lib/xlat_tables_v2/xlat_tables.mk PLAT_INCLUDES := -Iplat/imx/common/include \ -Iplat/imx/imx8m/include \ @@ -38,12 +41,11 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ plat/imx/common/imx_sip_handler.c \ plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_uart_console.S \ - lib/xlat_tables/aarch64/xlat_tables.c \ - lib/xlat_tables/xlat_tables_common.c \ lib/cpus/aarch64/cortex_a53.S \ drivers/arm/tzc/tzc380.c \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ + ${XLAT_TABLES_LIB_SRCS} \ ${IMX_DRAM_SOURCES} \ ${IMX_GIC_SOURCES} @@ -60,3 +62,7 @@ $(eval $(call add_define,BL32_BASE)) BL32_SIZE ?= 0x2000000 $(eval $(call add_define,BL32_SIZE)) + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c index 1f101c8d..96ed998f 100644 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk index f4d2c810..93c63b18 100644 --- a/plat/imx/imx8m/imx8mn/platform.mk +++ b/plat/imx/imx8m/imx8mn/platform.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: BSD-3-Clause # +# Translation tables library +include lib/xlat_tables_v2/xlat_tables.mk + PLAT_INCLUDES := -Iplat/imx/common/include \ -Iplat/imx/imx8m/include \ -Iplat/imx/imx8m/imx8mn/include @@ -38,12 +41,11 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ plat/imx/common/imx_sip_handler.c \ plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_uart_console.S \ - lib/xlat_tables/aarch64/xlat_tables.c \ - lib/xlat_tables/xlat_tables_common.c \ lib/cpus/aarch64/cortex_a53.S \ drivers/arm/tzc/tzc380.c \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ + ${XLAT_TABLES_LIB_SRCS} \ ${IMX_DRAM_SOURCES} \ ${IMX_GIC_SOURCES} @@ -60,3 +62,7 @@ $(eval $(call add_define,BL32_BASE)) BL32_SIZE ?= 0x2000000 $(eval $(call add_define,BL32_SIZE)) + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index 1dc2c89f..fcfe0dfc 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk index 8a8bf087..612b6155 100644 --- a/plat/imx/imx8m/imx8mq/platform.mk +++ b/plat/imx/imx8m/imx8mq/platform.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: BSD-3-Clause # +# Translation tables library +include lib/xlat_tables_v2/xlat_tables.mk + PLAT_INCLUDES := -Iplat/imx/common/include \ -Iplat/imx/imx8m/include \ -Iplat/imx/imx8m/imx8mq/include @@ -37,12 +40,11 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ plat/imx/common/imx_sip_handler.c \ plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_uart_console.S \ - lib/xlat_tables/aarch64/xlat_tables.c \ - lib/xlat_tables/xlat_tables_common.c \ lib/cpus/aarch64/cortex_a53.S \ drivers/arm/tzc/tzc380.c \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ + ${XLAT_TABLES_LIB_SRCS} \ ${IMX_DRAM_SOURCES} \ ${IMX_GIC_SOURCES} @@ -66,3 +68,7 @@ $(eval $(call add_define,BL32_BASE)) BL32_SIZE ?= 0x2000000 $(eval $(call add_define,BL32_SIZE)) + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif diff --git a/plat/imx/imx8qm/imx8qm_bl31_setup.c b/plat/imx/imx8qm/imx8qm_bl31_setup.c index 3d072fbf..ae0879b7 100644 --- a/plat/imx/imx8qm/imx8qm_bl31_setup.c +++ b/plat/imx/imx8qm/imx8qm_bl31_setup.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/plat/imx/imx8qm/platform.mk b/plat/imx/imx8qm/platform.mk index 5cadf518..e62c5740 100644 --- a/plat/imx/imx8qm/platform.mk +++ b/plat/imx/imx8qm/platform.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: BSD-3-Clause # +# Translation tables library +include lib/xlat_tables_v2/xlat_tables.mk + PLAT_INCLUDES := -Iplat/imx/imx8qm/include \ -Iplat/imx/common/include \ @@ -24,11 +27,10 @@ BL31_SOURCES += plat/imx/common/lpuart_console.S \ plat/imx/common/imx8_psci.c \ plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_sip_handler.c \ - lib/xlat_tables/aarch64/xlat_tables.c \ - lib/xlat_tables/xlat_tables_common.c \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a72.S \ drivers/arm/cci/cci.c \ + ${XLAT_TABLES_LIB_SRCS} \ ${IMX_GIC_SOURCES} \ include plat/imx/common/sci/sci_api.mk @@ -46,3 +48,7 @@ ENABLE_CPU_DYNAMIC_RETENTION := 1 $(eval $(call add_define,ENABLE_CPU_DYNAMIC_RETENTION)) ENABLE_L2_DYNAMIC_RETENTION := 1 $(eval $(call add_define,ENABLE_L2_DYNAMIC_RETENTION)) + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif diff --git a/plat/imx/imx8qx/imx8qx_bl31_setup.c b/plat/imx/imx8qx/imx8qx_bl31_setup.c index 82e7cf66..24b773c1 100644 --- a/plat/imx/imx8qx/imx8qx_bl31_setup.c +++ b/plat/imx/imx8qx/imx8qx_bl31_setup.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/plat/imx/imx8qx/platform.mk b/plat/imx/imx8qx/platform.mk index c21b6f64..c4b67f25 100644 --- a/plat/imx/imx8qx/platform.mk +++ b/plat/imx/imx8qx/platform.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: BSD-3-Clause # +# Translation tables library +include lib/xlat_tables_v2/xlat_tables.mk + PLAT_INCLUDES := -Iplat/imx/imx8qx/include \ -Iplat/imx/common/include \ @@ -24,9 +27,8 @@ BL31_SOURCES += plat/imx/common/lpuart_console.S \ plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_sip_handler.c \ plat/common/plat_psci_common.c \ - lib/xlat_tables/xlat_tables_common.c \ - lib/xlat_tables/aarch64/xlat_tables.c \ lib/cpus/aarch64/cortex_a35.S \ + ${XLAT_TABLES_LIB_SRCS} \ ${IMX_GIC_SOURCES} \ include plat/imx/common/sci/sci_api.mk @@ -38,3 +40,7 @@ ENABLE_CPU_DYNAMIC_RETENTION := 1 $(eval $(call add_define,ENABLE_CPU_DYNAMIC_RETENTION)) ENABLE_L2_DYNAMIC_RETENTION := 1 $(eval $(call add_define,ENABLE_L2_DYNAMIC_RETENTION)) + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif -- cgit v1.2.3