From 2107609e97d2947ada2fd4eaf8d6f81c2bbcd413 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/platform.mk | 4 ++++ plat/imx/imx8m/imx8mp/platform.mk | 4 ++++ 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 | 6 ++++-- plat/imx/imx8qx/imx8qx_bl31_setup.c | 2 +- plat/imx/imx8qx/platform.mk | 6 ++++-- 10 files changed, 36 insertions(+), 12 deletions(-) diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c index 9dec6ef28..e86a8dac9 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 3e5c338b1..591b1b757 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 \ @@ -39,12 +42,11 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ plat/imx/common/imx_uart_console.S \ plat/imx/common/imx_ehf.c \ plat/imx/common/imx_sdei.c \ - 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} @@ -67,3 +69,7 @@ $(eval $(call add_define,IMX_BOOT_UART_BASE)) EL3_EXCEPTION_HANDLING := 1 SDEI_SUPPORT := 1 + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk index 5fb5a4131..7525ae8d0 100644 --- a/plat/imx/imx8m/imx8mn/platform.mk +++ b/plat/imx/imx8m/imx8mn/platform.mk @@ -64,3 +64,7 @@ $(eval $(call add_define,BL32_SIZE)) IMX_BOOT_UART_BASE ?= 0x30890000 $(eval $(call add_define,IMX_BOOT_UART_BASE)) + +ifeq (${SPD},trusty) + BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 +endif diff --git a/plat/imx/imx8m/imx8mp/platform.mk b/plat/imx/imx8m/imx8mp/platform.mk index 0e6bed02e..d7999d846 100644 --- a/plat/imx/imx8m/imx8mp/platform.mk +++ b/plat/imx/imx8m/imx8mp/platform.mk @@ -63,3 +63,7 @@ $(eval $(call add_define,BL32_SIZE)) IMX_BOOT_UART_BASE ?= 0x30890000 $(eval $(call add_define,IMX_BOOT_UART_BASE)) + +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 5eea9fd0f..a925dc81d 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 b850a5197..9ade6c90c 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 @@ -36,12 +39,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} @@ -65,3 +67,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 8d2b63ec5..cd46329a3 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 8a4d438b6..2512c20c3 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 \ @@ -23,11 +26,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 diff --git a/plat/imx/imx8qx/imx8qx_bl31_setup.c b/plat/imx/imx8qx/imx8qx_bl31_setup.c index 0a4373165..8bd650d67 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 fe8120fea..995260561 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 \ @@ -23,9 +26,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 -- cgit v1.2.3