diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-18 02:10:08 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-18 19:33:28 +0900 |
| commit | ecdc898da3f3c01a4034d875219c61357832c12c (patch) | |
| tree | d4f8036d6aaf05315cade813ccaeb7ea927a8c01 /plat/xilinx | |
| parent | 44f1c0bdeda023d853e460d7c949c16647a01273 (diff) | |
Use *_END instead of *_LIMIT for linker derived end addresses
The usage of _LIMIT seems odd here, so rename as follows:
BL_CODE_LIMIT --> BL_CODE_END
BL_RO_DATA_LIMIT --> BL_RO_DATA_END
BL1_CODE_LIMIT --> BL1_CODE_END
BL1_RO_DATA_LIMIT --> BL1_RO_DATA_END
Basically, we want to use _LIMIT and _END properly as follows:
*_SIZE + *_MAX_SIZE = *_LIMIT
*_SIZE + *_SIZE = *_END
The _LIMIT is generally defined by platform_def.h to indicate the
platform-dependent memory constraint. So, its typical usage is
ASSERT(. <= BL31_LIMIT, "BL31 image has exceeded its limit.")
in a linker script.
On the other hand, _END is used to indicate the end address of the
compiled image, i.e. we do not know it until the image is linked.
Here, all of these macros belong to the latter, so should be
suffixed with _END.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'plat/xilinx')
| -rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 4 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/tsp/tsp_plat_setup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index c05b094e..f6c4b98e 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -160,9 +160,9 @@ void bl31_plat_arch_setup(void) arm_setup_page_tables(BL31_BASE, BL31_END - BL31_BASE, BL_CODE_BASE, - BL_CODE_LIMIT, + BL_CODE_END, BL_RO_DATA_BASE, - BL_RO_DATA_LIMIT, + BL_RO_DATA_END, BL31_COHERENT_RAM_BASE, BL31_COHERENT_RAM_LIMIT); enable_mmu_el3(0); diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index 8e3ca624..cf9ec6ac 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -81,9 +81,9 @@ void tsp_plat_arch_setup(void) arm_setup_page_tables(BL32_BASE, BL32_END - BL32_BASE, BL_CODE_BASE, - BL_CODE_LIMIT, + BL_CODE_END, BL_RO_DATA_BASE, - BL_RO_DATA_LIMIT, + BL_RO_DATA_END, BL32_COHERENT_RAM_BASE, BL32_COHERENT_RAM_LIMIT ); |