diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-04-21 10:29:17 +0300 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2020-12-14 08:24:25 +0000 |
| commit | cfe526dce2b76cce3b4d1009bad676e2ec21afab (patch) | |
| tree | bc050cc2b8347c128d8e37a8bb314acaa0d992a2 /src/arch/x86/memlayout.ld | |
| parent | c2d6f5f4da3c89b3f432f05fb31879b8d4d50698 (diff) | |
arch/x86: Combine bootblock linker scripts
Packing bootblock sections is somewhat easier to understand
when these all appear in one .ld file.
Change-Id: Ie8629a89fa47a28db63ecc33c631b29ac5a77448
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47597
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/arch/x86/memlayout.ld')
| -rw-r--r-- | src/arch/x86/memlayout.ld | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld index cbf887cc1c..52694fa360 100644 --- a/src/arch/x86/memlayout.ld +++ b/src/arch/x86/memlayout.ld @@ -39,11 +39,5 @@ SECTIONS } #if ENV_BOOTBLOCK -/* Bootblock specific scripts which provide more SECTION directives. */ -#include <cpu/x86/16bit/entry16.ld> -#include <cpu/x86/16bit/reset16.ld> -#include <arch/x86/id.ld> -#if CONFIG(CPU_INTEL_FIRMWARE_INTERFACE_TABLE) -#include <cpu/intel/fit/fit.ld> -#endif +#include <arch/x86/bootblock.ld> #endif /* ENV_BOOTBLOCK */ |