summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Gagniuc <alexandrux.gagniuc@intel.com>2015-10-06 16:35:07 -0700
committerAaron Durbin <adurbin@chromium.org>2016-01-21 05:37:48 +0100
commit66bbb3187ecbed627e36b178d436123b8517bc88 (patch)
treedf981fc2b62b540e69349a465d90cd061fb9c1bc
parentee464b17ced5a4e85327bb11b42a663213393903 (diff)
downloadcoreboot-66bbb3187ecbed627e36b178d436123b8517bc88.tar.xz
*/Makefile.inc: Compile files needed by uart8250 in x86 bootblock
These files provide symbols needed by console and uart drivers. This was not an issue in the past, as we were not setting up a C environment this early in the boot process. Change-Id: Ied5106ac30a68971c8330e8f8270ab060994a89d Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc@intel.com> Reviewed-on: https://review.coreboot.org/12869 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/cpu/x86/lapic/Makefile.inc1
-rw-r--r--src/drivers/uart/Makefile.inc2
-rw-r--r--src/lib/Makefile.inc1
3 files changed, 4 insertions, 0 deletions
diff --git a/src/cpu/x86/lapic/Makefile.inc b/src/cpu/x86/lapic/Makefile.inc
index 1deec3f25f..c0a35727bb 100644
--- a/src/cpu/x86/lapic/Makefile.inc
+++ b/src/cpu/x86/lapic/Makefile.inc
@@ -3,6 +3,7 @@ ramstage-y += lapic_cpu_init.c
ramstage-y += secondary.S
romstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c
ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c
+bootblock-y += boot_cpu.c
verstage-y += boot_cpu.c
romstage-y += boot_cpu.c
ramstage-y += boot_cpu.c
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index fc33ee9101..4b2aa53507 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -10,6 +10,7 @@ smm-$(CONFIG_DEBUG_SMI) += util.c
# be located in the soc/ or cpu/ directories instead of here.
ifeq ($(CONFIG_DRIVERS_UART_8250IO),y)
+bootblock-y += uart8250io.c
verstage-y += uart8250io.c
romstage-y += uart8250io.c
ramstage-y += uart8250io.c
@@ -17,6 +18,7 @@ smm-$(CONFIG_DEBUG_SMI) += uart8250io.c
endif
ifeq ($(CONFIG_DRIVERS_UART_8250MEM),y)
+bootblock-y += uart8250mem.c
verstage-y += uart8250mem.c
romstage-y += uart8250mem.c
ramstage-y += uart8250mem.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 3ee2852097..f3db345974 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -87,6 +87,7 @@ endif
romstage-y += compute_ip_checksum.c
ifeq ($(CONFIG_COMPILER_GCC),y)
+bootblock-$(CONFIG_ARCH_BOOTBLOCK_X86_32) += gcc.c
verstage-$(CONFIG_ARCH_VERSTAGE_X86_32) += gcc.c
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += gcc.c
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += gcc.c