summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2024-02-05 15:10:28 +0100
committerMartin L Roth <gaumless@gmail.com>2024-03-26 22:53:31 +0000
commit929dfec0bd0ac8228f3fd97baa53cf611efe4d2d (patch)
tree679cef1668a723da5f33fc4eb039796fbf87e643 /src
parente8c3d39edb734843b690ca69316c487a2ca68942 (diff)
arch/x86/bootblock.ld: Align the base of bootblock downwards
Instead of using some aritmetics that sometimes works, use the largest alignment necessary (page tables) and align downwards in the linker script. This fixes linking failing when linking in page tables inside the bootblock. This can result in a slight increase in bootblock size of at most 4096 - 512 bytes. Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Change-Id: I78c6ba6e250ded3f04b12cd0c20b18cb653a1506 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80346 Reviewed-by: Martin L Roth <gaumless@gmail.com> Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/bootblock.ld11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/arch/x86/bootblock.ld b/src/arch/x86/bootblock.ld
index d59eb27a64..65479851ce 100644
--- a/src/arch/x86/bootblock.ld
+++ b/src/arch/x86/bootblock.ld
@@ -17,19 +17,16 @@ SECTIONS {
. = _ebootblock - CONFIG_C_ENV_BOOTBLOCK_SIZE;
#else
. = BOOTBLOCK_TOP - PROGRAM_SZ;
- . = ALIGN(64);
+ /* Page tables need to be at a 4K boundary so align the bootblock downwards */
+ . = ALIGN(4096);
+ . -= 4096;
#endif
_bootblock = .;
INCLUDE "bootblock/lib/program.ld"
- /*
- * Allocation reserves extra space here. Alignment requirements
- * may cause the total size of a section to change when the start
- * address gets applied.
- */
- PROGRAM_SZ = SIZEOF(.text) + 512;
+ PROGRAM_SZ = SIZEOF(.text);
. = MIN(_ECFW_PTR, MIN(_ID_SECTION, _FIT_POINTER)) - EARLYASM_SZ;
. = CONFIG(SIPI_VECTOR_IN_ROM) ? ALIGN(4096) : ALIGN(16);