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

fix(imx8m): fix imx8mq build break

Browse source 
Fix the build break for i.MX8MQ to make it boot
with basic function enabled.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Change-Id: I2ff7976e3fb7960d6876d26fe0b4a78e51219ae2
This commit is contained in:
Jacky Bai 2024-10-17 17:56:41 +08:00
parent 3a36f70ba0
commit 1b65be5943
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -209,13 +209,19 @@ void bl31_plat_arch_setup(void)
MT_MEMORY | MT_RW | MT_SECURE), MT_MEMORY | MT_RW | MT_SECURE),
MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE, MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE,
MT_MEMORY | MT_RO | MT_SECURE), MT_MEMORY | MT_RO | MT_SECURE),
#if SEPARATE_NOBITS_REGION
MAP_REGION_FLAT(BL_NOBITS_BASE, BL_NOBITS_END - BL_NOBITS_BASE,
MT_RW_DATA | MT_SECURE),
#endif
#if USE_COHERENT_MEM #if USE_COHERENT_MEM
MAP_REGION_FLAT(BL_COHERENT_RAM_BASE, MAP_REGION_FLAT(BL_COHERENT_RAM_BASE,
BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE,
MT_DEVICE | MT_RW | MT_SECURE), MT_DEVICE | MT_RW | MT_SECURE),
#endif #endif
#if defined(SPD_opteed) || defined(SPD_trusty)
/* Map TEE memory */ /* Map TEE memory */
MAP_REGION_FLAT(BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW), MAP_REGION_FLAT(BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW),
#endif
{0}, {0},
}; };

12
plat/imx/imx8m/imx8mq/include/platform_def.h
View file

@ -37,6 +37,12 @@
#define BL31_SIZE SZ_64K #define BL31_SIZE SZ_64K
#define BL31_LIMIT (BL31_BASE + BL31_SIZE) #define BL31_LIMIT (BL31_BASE + BL31_SIZE)
#define OCRAM_S_BASE U(0x180000)
#define OCRAM_S_SIZE SZ_32K
#define OCRAM_S_LIMIT (OCRAM_S_BASE + OCRAM_S_SIZE)
#define BL31_NOBITS_BASE OCRAM_S_BASE
#define BL31_NOBITS_LIMIT (BL31_NOBITS_BASE + SZ_32K)
/* non-secure uboot base */ /* non-secure uboot base */
#ifndef PLAT_NS_IMAGE_OFFSET #ifndef PLAT_NS_IMAGE_OFFSET
#define PLAT_NS_IMAGE_OFFSET U(0x40200000) #define PLAT_NS_IMAGE_OFFSET U(0x40200000)
@ -54,7 +60,7 @@
#define MAX_XLAT_TABLES 5 #define MAX_XLAT_TABLES 5
#define MAX_MMAP_REGIONS 15 #define MAX_MMAP_REGIONS 15
#else #else
#define MAX_XLAT_TABLES 4 #define MAX_XLAT_TABLES 3
#define MAX_MMAP_REGIONS 14 #define MAX_MMAP_REGIONS 14
#endif #endif
@ -144,10 +150,6 @@
#define GPR_TZASC_EN BIT(0) #define GPR_TZASC_EN BIT(0)
#define GPR_TZASC_EN_LOCK BIT(16) #define GPR_TZASC_EN_LOCK BIT(16)
#define OCRAM_S_BASE U(0x00180000)
#define OCRAM_S_SIZE U(0x8000)
#define OCRAM_S_LIMIT (OCRAM_S_BASE + OCRAM_S_SIZE)
#define COUNTER_FREQUENCY 8333333 /* 25MHz / 3 */ #define COUNTER_FREQUENCY 8333333 /* 25MHz / 3 */
#define IMX_WDOG_B_RESET #define IMX_WDOG_B_RESET

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

@ -64,6 +64,8 @@ ifeq (${IMX_DRAM_RETENTION},1)
BL31_SOURCES += ${IMX_DRAM_SOURCES} BL31_SOURCES += ${IMX_DRAM_SOURCES}
endif endif
SEPARATE_NOBITS_REGION := 1
ifneq (${PRELOADED_BL33_BASE},) ifneq (${PRELOADED_BL33_BASE},)
$(eval $(call add_define_val,PLAT_NS_IMAGE_OFFSET,${PRELOADED_BL33_BASE})) $(eval $(call add_define_val,PLAT_NS_IMAGE_OFFSET,${PRELOADED_BL33_BASE}))
endif endif