diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2022-07-04 12:14:54 +0200 |
|---|---|---|
| committer | Marco Felsch <m.felsch@pengutronix.de> | 2022-10-20 18:21:33 +0200 |
| commit | 796a249c2dd12fd3e871f92feefb859d8067ad87 (patch) | |
| tree | f5c5b7cdc6d6a78d386eb662cee65bb8b9dc9093 /plat/imx/imx8m | |
| parent | 602b3286a515a78f6ed674ed99a5167fbcaf92c1 (diff) | |
| download | arm-trusted-firmware-796a249c2dd12fd3e871f92feefb859d8067ad87.tar.gz | |
refactor(imx8mn): introduce BL31_SIZE
Introduce BL31_SIZE define and calculate the limit based on the
BL31_BASE and the BL31_SIZE define. Also make use of SZ_128K to make it
easier to read. This is required for later BL31 PIE support since it
drops the calculation based on the BL31_LIMIT and BL31_BASE.
While on it remove the duplicated <lib/utils_def.h> include.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Change-Id: Ifca40bd5682ef993db986439115abd9e9a66a5b2
Diffstat (limited to 'plat/imx/imx8m')
| -rw-r--r-- | plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mn/include/platform_def.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c index 34ee5bcac..da5c9eecf 100644 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c @@ -180,7 +180,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, } #define MAP_BL31_TOTAL \ - MAP_REGION_FLAT(BL31_BASE, BL31_LIMIT - BL31_BASE, MT_MEMORY | MT_RW | MT_SECURE) + MAP_REGION_FLAT(BL31_BASE, BL31_SIZE, MT_MEMORY | MT_RW | MT_SECURE) #define MAP_BL31_RO \ MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE, MT_MEMORY | MT_RO | MT_SECURE) #define MAP_COHERENT_MEM \ diff --git a/plat/imx/imx8m/imx8mn/include/platform_def.h b/plat/imx/imx8m/imx8mn/include/platform_def.h index dbb44165c..e6c4bafa6 100644 --- a/plat/imx/imx8m/imx8mn/include/platform_def.h +++ b/plat/imx/imx8m/imx8mn/include/platform_def.h @@ -8,8 +8,7 @@ #include <lib/utils_def.h> #include <lib/xlat_tables/xlat_tables_v2.h> - -#include <lib/utils_def.h> +#include <plat/common/common_def.h> #define PLATFORM_LINKER_FORMAT "elf64-littleaarch64" #define PLATFORM_LINKER_ARCH aarch64 @@ -42,7 +41,8 @@ #define PLAT_SDEI_SGI_PRIVATE U(9) #define BL31_BASE U(0x960000) -#define BL31_LIMIT U(0x980000) +#define BL31_SIZE SZ_128K +#define BL31_LIMIT (BL31_BASE + BL31_SIZE) /* non-secure uboot base */ #define PLAT_NS_IMAGE_OFFSET U(0x40200000) |