Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 12:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(imx8/imx8m): switch to xlat_tables_v2

Browse source 
spd trusty requires memory dynamic mapping feature to be
enabled, so we have to use xlat table library v2 instead
of v1.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Change-Id: I2813af9c7878b1fc2a59e27619c5b643af6a1e91
This commit is contained in:
Ji Luo 2020-02-20 23:47:21 +08:00 • committed by Jacky Bai
parent d5ede92d78
commit 4f8d5b018e
10 changed files with 42 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
View file

@ -18,7 +18,7 @@
#include <drivers/generic_delay_timer.h> #include <drivers/generic_delay_timer.h>
#include <lib/el3_runtime/context_mgmt.h> #include <lib/el3_runtime/context_mgmt.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <gpc.h> #include <gpc.h>

11
plat/imx/imx8m/imx8mm/platform.mk
View file

@ -3,6 +3,9 @@
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
#
# Translation tables library
include lib/xlat_tables_v2/xlat_tables.mk
PLAT_INCLUDES := -Iplat/imx/common/include \ PLAT_INCLUDES := -Iplat/imx/common/include \
-Iplat/imx/imx8m/include \ -Iplat/imx/imx8m/include \
@ -35,12 +38,11 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \
plat/imx/common/imx_sip_handler.c \ plat/imx/common/imx_sip_handler.c \
plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_sip_svc.c \
plat/imx/common/imx_uart_console.S \ 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 \ lib/cpus/aarch64/cortex_a53.S \
drivers/arm/tzc/tzc380.c \ drivers/arm/tzc/tzc380.c \
drivers/delay_timer/delay_timer.c \ drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
${XLAT_TABLES_LIB_SRCS} \
${IMX_GIC_SOURCES} ${IMX_GIC_SOURCES}
ifeq (${NEED_BL2},yes) ifeq (${NEED_BL2},yes)
@ -163,5 +165,8 @@ ifeq (${MEASURED_BOOT},1)
BL2_SOURCES += plat/imx/imx8m/imx8m_measured_boot.c \ BL2_SOURCES += plat/imx/imx8m/imx8m_measured_boot.c \
plat/imx/imx8m/imx8m_dyn_cfg_helpers.c \ plat/imx/imx8m/imx8m_dyn_cfg_helpers.c \
${EVENT_LOG_SOURCES} ${EVENT_LOG_SOURCES}
endif
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif

4
plat/imx/imx8m/imx8mn/platform.mk
View file

@ -61,3 +61,7 @@ ifeq (${SDEI_SUPPORT}, 1)
BL31_SOURCES += plat/imx/common/imx_ehf.c \ BL31_SOURCES += plat/imx/common/imx_ehf.c \
plat/imx/common/imx_sdei.c plat/imx/common/imx_sdei.c
endif endif
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif

4
plat/imx/imx8m/imx8mp/platform.mk
View file

@ -153,3 +153,7 @@ ifeq (${SDEI_SUPPORT}, 1)
BL31_SOURCES += plat/imx/common/imx_ehf.c \ BL31_SOURCES += plat/imx/common/imx_ehf.c \
plat/imx/common/imx_sdei.c plat/imx/common/imx_sdei.c
endif endif
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif

4
plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -18,7 +18,7 @@
#include <drivers/generic_delay_timer.h> #include <drivers/generic_delay_timer.h>
#include <lib/el3_runtime/context_mgmt.h> #include <lib/el3_runtime/context_mgmt.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <gpc.h> #include <gpc.h>

12
plat/imx/imx8m/imx8mq/platform.mk
View file

@ -1,9 +1,12 @@
# #
# Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
# Translation tables library
include lib/xlat_tables_v2/xlat_tables.mk
PLAT_INCLUDES := -Iplat/imx/common/include \ PLAT_INCLUDES := -Iplat/imx/common/include \
-Iplat/imx/imx8m/include \ -Iplat/imx/imx8m/include \
-Iplat/imx/imx8m/imx8mq/include -Iplat/imx/imx8m/imx8mq/include
@ -28,12 +31,11 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \
plat/imx/common/imx_sip_handler.c \ plat/imx/common/imx_sip_handler.c \
plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_sip_svc.c \
plat/imx/common/imx_uart_console.S \ 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 \ lib/cpus/aarch64/cortex_a53.S \
drivers/arm/tzc/tzc380.c \ drivers/arm/tzc/tzc380.c \
drivers/delay_timer/delay_timer.c \ drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
${XLAT_TABLES_LIB_SRCS} \
${IMX_GIC_SOURCES} ${IMX_GIC_SOURCES}
USE_COHERENT_MEM := 1 USE_COHERENT_MEM := 1
@ -49,3 +51,7 @@ $(eval $(call add_define,BL32_BASE))
BL32_SIZE ?= 0x2000000 BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE)) $(eval $(call add_define,BL32_SIZE))
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif

4
plat/imx/imx8qm/imx8qm_bl31_setup.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -19,7 +19,7 @@
#include <drivers/console.h> #include <drivers/console.h>
#include <lib/el3_runtime/context_mgmt.h> #include <lib/el3_runtime/context_mgmt.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <imx8qm_pads.h> #include <imx8qm_pads.h>

8
plat/imx/imx8qm/platform.mk
View file

@ -1,9 +1,12 @@
# #
# Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
# Translation tables library
include lib/xlat_tables_v2/xlat_tables.mk
PLAT_INCLUDES := -Iplat/imx/imx8qm/include \ PLAT_INCLUDES := -Iplat/imx/imx8qm/include \
-Iplat/imx/common/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/imx8_psci.c \
plat/imx/common/imx_sip_svc.c \ plat/imx/common/imx_sip_svc.c \
plat/imx/common/imx_sip_handler.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_a53.S \
lib/cpus/aarch64/cortex_a72.S \ lib/cpus/aarch64/cortex_a72.S \
drivers/arm/cci/cci.c \ drivers/arm/cci/cci.c \
${XLAT_TABLES_LIB_SRCS} \
${IMX_GIC_SOURCES} \ ${IMX_GIC_SOURCES} \
include plat/imx/common/sci/sci_api.mk include plat/imx/common/sci/sci_api.mk

4
plat/imx/imx8qx/imx8qx_bl31_setup.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -19,7 +19,7 @@
#include <drivers/console.h> #include <drivers/console.h>
#include <lib/el3_runtime/context_mgmt.h> #include <lib/el3_runtime/context_mgmt.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <imx8qx_pads.h> #include <imx8qx_pads.h>

8
plat/imx/imx8qx/platform.mk
View file

@ -1,9 +1,12 @@
# #
# Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
# Translation tables library
include lib/xlat_tables_v2/xlat_tables.mk
PLAT_INCLUDES := -Iplat/imx/imx8qx/include \ PLAT_INCLUDES := -Iplat/imx/imx8qx/include \
-Iplat/imx/common/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_svc.c \
plat/imx/common/imx_sip_handler.c \ plat/imx/common/imx_sip_handler.c \
plat/common/plat_psci_common.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 \ lib/cpus/aarch64/cortex_a35.S \
${XLAT_TABLES_LIB_SRCS} \
${IMX_GIC_SOURCES} \ ${IMX_GIC_SOURCES} \
include plat/imx/common/sci/sci_api.mk include plat/imx/common/sci/sci_api.mk