summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/plat/common/common_def.h16
-rw-r--r--plat/arm/common/arm_bl1_setup.c4
-rw-r--r--plat/arm/common/arm_bl2_setup.c4
-rw-r--r--plat/arm/common/arm_bl2u_setup.c4
-rw-r--r--plat/arm/common/arm_bl31_setup.c4
-rw-r--r--plat/arm/common/sp_min/arm_sp_min_setup.c4
-rw-r--r--plat/arm/common/tsp/arm_tsp_setup.c4
-rw-r--r--plat/xilinx/zynqmp/bl31_zynqmp_setup.c4
-rw-r--r--plat/xilinx/zynqmp/tsp/tsp_plat_setup.c4
9 files changed, 24 insertions, 24 deletions
diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h
index e2c45138..8f50622f 100644
--- a/include/plat/common/common_def.h
+++ b/include/plat/common/common_def.h
@@ -119,22 +119,22 @@
*/
#if SEPARATE_CODE_AND_RODATA
#define BL_CODE_BASE (unsigned long)(&__TEXT_START__)
-#define BL_CODE_LIMIT (unsigned long)(&__TEXT_END__)
+#define BL_CODE_END (unsigned long)(&__TEXT_END__)
#define BL_RO_DATA_BASE (unsigned long)(&__RODATA_START__)
-#define BL_RO_DATA_LIMIT (unsigned long)(&__RODATA_END__)
+#define BL_RO_DATA_END (unsigned long)(&__RODATA_END__)
-#define BL1_CODE_LIMIT BL_CODE_LIMIT
+#define BL1_CODE_END BL_CODE_END
#define BL1_RO_DATA_BASE (unsigned long)(&__RODATA_START__)
-#define BL1_RO_DATA_LIMIT round_up(BL1_ROM_END, PAGE_SIZE)
+#define BL1_RO_DATA_END round_up(BL1_ROM_END, PAGE_SIZE)
#else
#define BL_CODE_BASE (unsigned long)(&__RO_START__)
-#define BL_CODE_LIMIT (unsigned long)(&__RO_END__)
+#define BL_CODE_END (unsigned long)(&__RO_END__)
#define BL_RO_DATA_BASE 0
-#define BL_RO_DATA_LIMIT 0
+#define BL_RO_DATA_END 0
-#define BL1_CODE_LIMIT round_up(BL1_ROM_END, PAGE_SIZE)
+#define BL1_CODE_END round_up(BL1_ROM_END, PAGE_SIZE)
#define BL1_RO_DATA_BASE 0
-#define BL1_RO_DATA_LIMIT 0
+#define BL1_RO_DATA_END 0
#endif /* SEPARATE_CODE_AND_RODATA */
#endif /* __COMMON_DEF_H__ */
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
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
);