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/arm/common | |
| 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/arm/common')
| -rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl2u_setup.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl31_setup.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/sp_min/arm_sp_min_setup.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/tsp/arm_tsp_setup.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index 50d102af..91809fb4 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -124,9 +124,9 @@ void arm_bl1_plat_arch_setup(void) arm_setup_page_tables(bl1_tzram_layout.total_base, bl1_tzram_layout.total_size, BL_CODE_BASE, - BL1_CODE_LIMIT, + BL1_CODE_END, BL1_RO_DATA_BASE, - BL1_RO_DATA_LIMIT + BL1_RO_DATA_END #if USE_COHERENT_MEM , BL1_COHERENT_RAM_BASE, BL1_COHERENT_RAM_LIMIT diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index a4fac0da..293e5e51 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -238,9 +238,9 @@ void arm_bl2_plat_arch_setup(void) arm_setup_page_tables(bl2_tzram_layout.total_base, bl2_tzram_layout.total_size, BL_CODE_BASE, - BL_CODE_LIMIT, + BL_CODE_END, BL_RO_DATA_BASE, - BL_RO_DATA_LIMIT + BL_RO_DATA_END #if USE_COHERENT_MEM , BL2_COHERENT_RAM_BASE, BL2_COHERENT_RAM_LIMIT diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c index de7d0c2f..cad42f07 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -95,9 +95,9 @@ void arm_bl2u_plat_arch_setup(void) arm_setup_page_tables(BL2U_BASE, BL31_LIMIT, BL_CODE_BASE, - BL_CODE_LIMIT, + BL_CODE_END, BL_RO_DATA_BASE, - BL_RO_DATA_LIMIT + BL_RO_DATA_END #if USE_COHERENT_MEM , BL2U_COHERENT_RAM_BASE, diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index bc1ec11e..6b6bae89 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -288,9 +288,9 @@ void arm_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 #if USE_COHERENT_MEM , BL31_COHERENT_RAM_BASE, BL31_COHERENT_RAM_LIMIT diff --git a/plat/arm/common/sp_min/arm_sp_min_setup.c b/plat/arm/common/sp_min/arm_sp_min_setup.c index d48556ee..40155f4e 100644 --- a/plat/arm/common/sp_min/arm_sp_min_setup.c +++ b/plat/arm/common/sp_min/arm_sp_min_setup.c @@ -202,9 +202,9 @@ void sp_min_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 #if USE_COHERENT_MEM , BL32_COHERENT_RAM_BASE, BL32_COHERENT_RAM_LIMIT diff --git a/plat/arm/common/tsp/arm_tsp_setup.c b/plat/arm/common/tsp/arm_tsp_setup.c index 09029f4c..58c2b7ba 100644 --- a/plat/arm/common/tsp/arm_tsp_setup.c +++ b/plat/arm/common/tsp/arm_tsp_setup.c @@ -91,9 +91,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 #if USE_COHERENT_MEM , BL32_COHERENT_RAM_BASE, BL32_COHERENT_RAM_LIMIT |