diff options
| author | Nishanth Menon <nm@ti.com> | 2021-03-26 02:06:40 -0500 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2021-03-26 02:25:44 -0500 |
| commit | 3dd87efb2e63249c7896dcae5324e1303bfc7b40 (patch) | |
| tree | 46eb7e70b607fd19e97329f219078302e5eaf28c | |
| parent | f5872a00478dc99dc8199da03ef62fd297e7d110 (diff) | |
| download | arm-trusted-firmware-3dd87efb2e63249c7896dcae5324e1303bfc7b40.tar.gz | |
plat: ti: k3: board: Let explicitly map our SEC_SRAM_BASE to 0x0
ENABLE_PIE (position independent executable) is default on K3
platform to handle variant RAM configurations in the system. This,
unfortunately does cause confusion while reading the code, so, lets
make things explicit by selecting 0x0 as the "SEC_SRAM_BASE" out of
which we compute the BL31_BASE depending on usage.
Lets also document a warning while at it to help folks copying code
over to a custom K3 platform and optimizing size by disabling PIE to
modify the defaults.
Signed-off-by: Nishanth Menon <nm@ti.com>
Change-Id: I8e67a9210e907e266ff6a78ba4d02e3259bb2b21
| -rw-r--r-- | plat/ti/k3/board/generic/include/board_def.h | 13 | ||||
| -rw-r--r-- | plat/ti/k3/board/lite/include/board_def.h | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/plat/ti/k3/board/generic/include/board_def.h b/plat/ti/k3/board/generic/include/board_def.h index 61753fb6b..4ff687cd8 100644 --- a/plat/ti/k3/board/generic/include/board_def.h +++ b/plat/ti/k3/board/generic/include/board_def.h @@ -18,8 +18,19 @@ /* * This RAM will be used for the bootloader including code, bss, and stacks. * It may need to be increased if BL31 grows in size. + * + * The link addresses are determined by SEC_SRAM_BASE + offset. + * When ENABLE_PIE is set, the TF images can be loaded anywhere, so + * SEC_SRAM_BASE is really arbitrary. + * + * When ENABLE_PIE is unset, SEC_SRAM_BASE should be chosen so that + * it matches to the physical address where BL31 is loaded, that is, + * SEC_SRAM_BASE should be the base address of the RAM region. + * + * Lets make things explicit by mapping SRAM_BASE to 0x0 since ENABLE_PIE is + * defined as default for our platform. */ -#define SEC_SRAM_BASE UL(0x70000000) /* Base of MSMC SRAM */ +#define SEC_SRAM_BASE UL(0x00000000) /* PIE remapped on fly */ #define SEC_SRAM_SIZE UL(0x00020000) /* 128k */ #define PLAT_MAX_OFF_STATE U(2) diff --git a/plat/ti/k3/board/lite/include/board_def.h b/plat/ti/k3/board/lite/include/board_def.h index 19587569c..18b7f4206 100644 --- a/plat/ti/k3/board/lite/include/board_def.h +++ b/plat/ti/k3/board/lite/include/board_def.h @@ -20,8 +20,19 @@ * It may need to be increased if BL31 grows in size. * Current computation assumes data structures necessary for GIC and ARM for * a single cluster of 4 processor. + * + * The link addresses are determined by SEC_SRAM_BASE + offset. + * When ENABLE_PIE is set, the TF images can be loaded anywhere, so + * SEC_SRAM_BASE is really arbitrary. + * + * When ENABLE_PIE is unset, SEC_SRAM_BASE should be chosen so that + * it matches to the physical address where BL31 is loaded, that is, + * SEC_SRAM_BASE should be the base address of the RAM region. + * + * Lets make things explicit by mapping SRAM_BASE to 0x0 since ENABLE_PIE is + * defined as default for our platform. */ -#define SEC_SRAM_BASE UL(0x70000000) /* Base of SRAM */ +#define SEC_SRAM_BASE UL(0x00000000) /* PIE remapped on fly */ #define SEC_SRAM_SIZE UL(0x0001c000) /* 112k */ #define PLAT_MAX_OFF_STATE U(2) |