diff options
| -rw-r--r-- | src/arch/x86/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/arch/x86/car.ld | 1 | ||||
| -rw-r--r-- | src/arch/x86/memlayout.ld | 8 |
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 */ |