summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2022-05-15 21:46:44 +0200
committerFelix Held <felix-coreboot@felixheld.de>2022-07-20 20:29:13 +0000
commit28de28d8de3c9d3fd1cc25d68bbaa884e0358c24 (patch)
treeb07ffaf0c21f2b65c6f1bb2e472a4c31086f84e3 /src/arch
parent3e914d372661ba68ca92d476708bd68af2593b10 (diff)
arch/x86/*.ld: Don't use CPP to include linker scripts
This makes inspection of linker scripts in the build dir a little easier. Change-Id: I509faa4cee2c9f066f4e20f6038349e1165a619a Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/64362 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/Makefile.inc5
-rw-r--r--src/arch/x86/car.ld1
-rw-r--r--src/arch/x86/memlayout.ld8
3 files changed, 10 insertions, 4 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index de2dc19c4e..50c344c7d3 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -93,6 +93,8 @@ bootblock-$(CONFIG_BOOTBLOCK_NORMAL) += bootblock_normal.c
bootblock-y += gdt_init.S
bootblock-y += id.S
bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
+bootblock-y += bootblock.ld
+bootblock-y += car.ld
$(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h
@@ -142,6 +144,8 @@ verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += verstage.c
verstage-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c
+verstage-y += car.ld
+
verstage-libs ?=
ifeq ($(CONFIG_ARCH_VERSTAGE_X86_32),y)
@@ -177,6 +181,7 @@ romstage-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c
romstage-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
romstage-$(CONFIG_COOP_MULTITASKING) += thread.c
romstage-$(CONFIG_COOP_MULTITASKING) += thread_switch.S
+romstage-y += car.ld
romstage-srcs += $(wildcard $(src)/mainboard/$(MAINBOARDDIR)/romstage.c)
romstage-libs ?=
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 331c256ece..132937f4ee 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -2,6 +2,7 @@
/* CACHE_ROM_SIZE defined here. */
#include <cpu/x86/mtrr.h>
+#include <memlayout.h>
/* This file is included inside a SECTIONS block */
. = CONFIG_DCACHE_RAM_BASE;
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index bbd5450058..549c2f9041 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -21,16 +21,16 @@ SECTIONS
* Link at 32MiB address and rely on cbfstool to relocate to XIP. */
ROMSTAGE(CONFIG_ROMSTAGE_ADDR, 1M)
- #include "car.ld"
+ INCLUDE "romstage/arch/x86/car.ld"
#elif ENV_SEPARATE_VERSTAGE
/* The 1M size is not allocated. It's just for basic size checking.
* Link at 32MiB address and rely on cbfstool to relocate to XIP. */
VERSTAGE(CONFIG_VERSTAGE_ADDR, 1M)
- #include "car.ld"
+ INCLUDE "verstage/arch/x86/car.ld"
#elif ENV_BOOTBLOCK
- #include "car.ld"
+ INCLUDE "bootblock/arch/x86/car.ld"
#elif ENV_POSTCAR
POSTCAR(32M, 1M)
@@ -38,5 +38,5 @@ SECTIONS
}
#if ENV_BOOTBLOCK
-#include <arch/x86/bootblock.ld>
+ INCLUDE "bootblock/arch/x86/bootblock.ld"
#endif /* ENV_BOOTBLOCK */