Skip to content

GitLab

Commit c6213c7e authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge "plat/arm: Reduce size of BL31 binary" into integration

parents 8f09da46 fa1fdb22
Show whitespace changes
Inline Side-by-side
include/plat/arm/common/arm_reclaim_init.ld.S
View file @ c6213c7e
...@@ -13,8 +13,6 @@ SECTIONS ...@@ -13,8 +13,6 @@ SECTIONS
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__INIT_CODE_START__ = .; __INIT_CODE_START__ = .;
*(*text.init*); *(*text.init*);
__INIT_CODE_UNALIGNED__ = .;
. = ALIGN(PAGE_SIZE);
__INIT_CODE_END__ = .; __INIT_CODE_END__ = .;
} >RAM } >RAM
...@@ -42,6 +40,7 @@ SECTIONS ...@@ -42,6 +40,7 @@ SECTIONS
/* Offset mask */ \ /* Offset mask */ \
MASK = ABS(SIGN >> 63) - 1; \ MASK = ABS(SIGN >> 63) - 1; \
. += ABS(OFFSET) & ABS(MASK); \ . += ABS(OFFSET) & ABS(MASK); \
. = ALIGN(PAGE_SIZE); \
__STACKS_END__ = .; \ __STACKS_END__ = .; \
/* Total stack size */ \ /* Total stack size */ \
SIZE = ABS(. - __STACKS_START__); \ SIZE = ABS(. - __STACKS_START__); \
......
plat/arm/common/arm_bl31_setup.c
View file @ c6213c7e
...@@ -46,7 +46,10 @@ CASSERT(BL31_BASE >= ARM_FW_CONFIG_LIMIT, assert_bl31_base_overflows); ...@@ -46,7 +46,10 @@ CASSERT(BL31_BASE >= ARM_FW_CONFIG_LIMIT, assert_bl31_base_overflows);
MT_MEMORY | MT_RW | MT_SECURE) MT_MEMORY | MT_RW | MT_SECURE)
#if RECLAIM_INIT_CODE #if RECLAIM_INIT_CODE
IMPORT_SYM(unsigned long, __INIT_CODE_START__, BL_INIT_CODE_BASE); IMPORT_SYM(unsigned long, __INIT_CODE_START__, BL_INIT_CODE_BASE);
IMPORT_SYM(unsigned long, __INIT_CODE_END__, BL_INIT_CODE_END); IMPORT_SYM(unsigned long, __INIT_CODE_END__, BL_CODE_END_UNALIGNED);
#define BL_INIT_CODE_END ((BL_CODE_END_UNALIGNED + PAGE_SIZE - 1) & \
~(PAGE_SIZE - 1))
#define MAP_BL_INIT_CODE MAP_REGION_FLAT( \ #define MAP_BL_INIT_CODE MAP_REGION_FLAT( \
BL_INIT_CODE_BASE, \ BL_INIT_CODE_BASE, \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment