From b05631afdc77009c98e577ac16fd2699be3c727d Mon Sep 17 00:00:00 2001 From: Jacky Bai Date: Tue, 9 Apr 2019 10:55:24 +0800 Subject: plat: imx8mq: Remove duplicated linker symbols Remove duplicated linker symbols, resue the symbols defined in bl_common.h Change-Id: I10de450eccc78c09b61a8ae7126bf4f4029fa682 Signed-off-by: Jacky Bai --- plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c') diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index 92633540..eadf8811 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -25,13 +25,6 @@ #include #include -IMPORT_SYM(uintptr_t, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START); -IMPORT_SYM(uintptr_t, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END); -IMPORT_SYM(uintptr_t, __RO_START__, BL31_RO_START); -IMPORT_SYM(uintptr_t, __RO_END__, BL31_RO_END); -IMPORT_SYM(uintptr_t, __RW_START__, BL31_RW_START); -IMPORT_SYM(uintptr_t, __RW_END__, BL31_RW_END); - static const mmap_region_t imx_mmap[] = { MAP_REGION_FLAT(GPV_BASE, GPV_SIZE, MT_DEVICE | MT_RW), /* GPV map */ MAP_REGION_FLAT(IMX_AIPS_BASE, IMX_AIPS_SIZE, MT_DEVICE | MT_RW), /* AIPS map */ @@ -109,16 +102,16 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_plat_arch_setup(void) { - mmap_add_region(BL31_RO_START, BL31_RO_START, (BL31_RO_END - BL31_RO_START), - MT_MEMORY | MT_RO | MT_SECURE); - mmap_add_region(BL31_RW_START, BL31_RW_START, (BL31_RW_END - BL31_RW_START), + mmap_add_region(BL31_BASE, BL31_BASE, (BL31_LIMIT - BL31_BASE), MT_MEMORY | MT_RW | MT_SECURE); + mmap_add_region(BL_CODE_BASE, BL_CODE_BASE, (BL_CODE_END - BL_CODE_BASE), + MT_MEMORY | MT_RO | MT_SECURE); mmap_add(imx_mmap); #if USE_COHERENT_MEM - mmap_add_region(BL31_COHERENT_RAM_START, BL31_COHERENT_RAM_START, - BL31_COHERENT_RAM_END - BL31_COHERENT_RAM_START, + mmap_add_region(BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_BASE, + BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE, MT_DEVICE | MT_RW | MT_SECURE); #endif /* setup xlat table */ -- cgit v1.2.3