diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-03-26 10:51:39 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-04-02 12:33:18 +0900 |
| commit | 9fb288a03ed2ced7706defbbf78f008e921e17e2 (patch) | |
| tree | e1916afee644c57e87d40cd4986dc2c849468173 /bl32/tsp/tsp.ld.S | |
| parent | 0a43db84af8cafaf35155d0e96e679b79a775272 (diff) | |
| download | platform_external_arm-trusted-firmware-9fb288a03ed2ced7706defbbf78f008e921e17e2.tar.gz platform_external_arm-trusted-firmware-9fb288a03ed2ced7706defbbf78f008e921e17e2.tar.bz2 platform_external_arm-trusted-firmware-9fb288a03ed2ced7706defbbf78f008e921e17e2.zip | |
linker_script: move more common code to bl_common.ld.h
These are mostly used to collect data from special structure,
and repeated in many linker scripts.
To differentiate the alignment size between aarch32/aarch64, I added
a new macro STRUCT_ALIGN.
While I moved the PMF_SVC_DESCS, I dropped #if ENABLE_PMF conditional.
As you can see in include/lib/pmf/pmf_helpers.h, PMF_REGISTER_SERVICE*
are no-op when ENABLE_PMF=0. So, pmf_svc_descs and pmf_timestamp_array
data are not populated.
Change-Id: I3f4ab7fa18f76339f1789103407ba76bda7e56d0
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'bl32/tsp/tsp.ld.S')
| -rw-r--r-- | bl32/tsp/tsp.ld.S | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/bl32/tsp/tsp.ld.S b/bl32/tsp/tsp.ld.S index da60c63a7..b1ec42350 100644 --- a/bl32/tsp/tsp.ld.S +++ b/bl32/tsp/tsp.ld.S @@ -6,7 +6,6 @@ #include <common/bl_common.ld.h> #include <lib/xlat_tables/xlat_tables_defs.h> -#include <platform_def.h> OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) @@ -38,15 +37,7 @@ SECTIONS __RODATA_START__ = .; *(.rodata*) - /* - * Keep the .got section in the RO section as it is patched - * prior to enabling the MMU and having the .got in RO is better for - * security. GOT is a table of addresses so ensure 8-byte alignment. - */ - . = ALIGN(8); - __GOT_START__ = .; - *(.got) - __GOT_END__ = .; + GOT . = ALIGN(PAGE_SIZE); __RODATA_END__ = .; @@ -58,15 +49,7 @@ SECTIONS *(.text*) *(.rodata*) - /* - * Keep the .got section in the RO section as it is patched - * prior to enabling the MMU and having the .got in RO is better for - * security. GOT is a table of addresses so ensure 8-byte alignment. - */ - . = ALIGN(8); - __GOT_START__ = .; - *(.got) - __GOT_END__ = .; + GOT *(.vectors) |