diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2022-08-22 12:30:11 +0200 |
|---|---|---|
| committer | Marco Felsch <m.felsch@pengutronix.de> | 2022-10-20 18:22:43 +0200 |
| commit | 40ff8ff8fd1bb85a09937fe05d30c59ac1689724 (patch) | |
| tree | 0358ebc524e1b55033a9c3c66f6da00fcdfe5e95 /plat/imx/imx8m/imx8mm | |
| parent | 0b727248ce2d4033b4406f5a7a63ff86672dfc29 (diff) | |
| download | arm-trusted-firmware-40ff8ff8fd1bb85a09937fe05d30c59ac1689724.tar.gz | |
refactor(imx8mm): introduce BL2_SIZE and BL31_SIZE
No functional change.
Introduce BLx_SIZE defines and calculate the limits based on the
BLx_BASE and the BLx_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.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Change-Id: I8670faa5d5a572ef230011594f3d0d594fb257d9
Diffstat (limited to 'plat/imx/imx8m/imx8mm')
| -rw-r--r-- | plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mm/include/platform_def.h | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c index 13a4fa6f4..d63e0a5e7 100644 --- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c @@ -175,7 +175,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/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h index 84d86b906..d70f03117 100644 --- a/plat/imx/imx8m/imx8mm/include/platform_def.h +++ b/plat/imx/imx8m/imx8mm/include/platform_def.h @@ -7,6 +7,7 @@ #include <arch.h> #include <common/tbbr/tbbr_img_def.h> #include <lib/utils_def.h> +#include <plat/common/common_def.h> #define PLATFORM_LINKER_FORMAT "elf64-littleaarch64" #define PLATFORM_LINKER_ARCH aarch64 @@ -40,9 +41,9 @@ #if defined(NEED_BL2) #define BL2_BASE U(0x920000) -#define BL2_LIMIT U(0x940000) +#define BL2_SIZE SZ_128K +#define BL2_LIMIT (BL2_BASE + BL2_SIZE) #define BL31_BASE U(0x900000) -#define BL31_LIMIT U(0x920000) #define IMX_FIP_BASE U(0x40310000) #define IMX_FIP_SIZE U(0x000300000) #define IMX_FIP_LIMIT U(FIP_BASE + FIP_SIZE) @@ -53,9 +54,11 @@ #define PLAT_IMX8MM_BOOT_MMC_BASE U(0x30B50000) /* SD */ #else #define BL31_BASE U(0x920000) -#define BL31_LIMIT U(0x940000) #endif +#define BL31_SIZE SZ_128K +#define BL31_LIMIT (BL31_BASE + BL31_SIZE) + /* non-secure uboot base */ #define PLAT_NS_IMAGE_OFFSET U(0x40200000) #define PLAT_NS_IMAGE_SIZE U(0x00200000) |