summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-10-04 17:47:36 -0700
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-10-08 19:11:24 +0000
commitee2740b7f63a7266e218fb97b657a67a8d1fde50 (patch)
tree3a702039281acd8e069b183ad2aa80a3f2ed6ba2
parentc46a39237a18bdd4de826bce10ae89be718f9289 (diff)
downloadcoreboot-ee2740b7f63a7266e218fb97b657a67a8d1fde50.tar.xz
arch/x86/bootblock: Do not include non-code files in bootblock.S
Since we now have more freedom in the bootblock linking step it no longer makes sense to use a monolithic bootblock.S. Code segments must still be included as the order in bootblock.S determines code flow. However, non-code flow related assembly stubs don't need to be directly included in bootblock.S Change-Id: I08e86e92d82bd2138194ed42652f268b0764aa54 Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-on: http://review.coreboot.org/11792 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/arch/x86/Makefile.inc1
-rw-r--r--src/arch/x86/bootblock.S5
-rw-r--r--src/arch/x86/id.S (renamed from src/arch/x86/id.inc)0
-rw-r--r--src/cpu/intel/Makefile.inc1
-rw-r--r--src/cpu/intel/fit/Makefile.inc1
-rw-r--r--src/cpu/intel/fit/fit.S (renamed from src/cpu/intel/fit/fit.inc)0
6 files changed, 3 insertions, 5 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 46c98cd142..56b176d6b6 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -84,6 +84,7 @@ endif
# Add the assembly file that pulls in the rest of the dependencies in
# the right order. Make sure the auto generated bootblock.inc is a proper
# dependency. Make the same true for the linker sript.
+bootblock-y += id.S
bootblock-y += bootblock.S
bootblock-y += walkcbfs.S
$(obj)/arch/x86/bootblock.bootblock.o: $(objgenerated)/bootblock.inc
diff --git a/src/arch/x86/bootblock.S b/src/arch/x86/bootblock.S
index bea178d785..645e491ffe 100644
--- a/src/arch/x86/bootblock.S
+++ b/src/arch/x86/bootblock.S
@@ -25,11 +25,6 @@
#include <cpu/x86/16bit/entry16.inc>
#include <cpu/x86/16bit/reset16.inc>
#include <cpu/x86/32bit/entry32.inc>
-#include <arch/x86/id.inc>
-
-#if IS_ENABLED(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE)
-#include <cpu/intel/fit/fit.inc>
-#endif
#ifdef CONFIG_CHIPSET_BOOTBLOCK_INCLUDE
#include CONFIG_CHIPSET_BOOTBLOCK_INCLUDE
diff --git a/src/arch/x86/id.inc b/src/arch/x86/id.S
index a3df25e111..a3df25e111 100644
--- a/src/arch/x86/id.inc
+++ b/src/arch/x86/id.S
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index 6f07e30b5e..904aa5d7b5 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -3,6 +3,7 @@
#
# Therefore: ONLY include Makefile.inc from socket directories!
+subdirs-$(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE) += fit
subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441
subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += socket_BGA956
subdirs-$(CONFIG_CPU_INTEL_EP80579) += ep80579
diff --git a/src/cpu/intel/fit/Makefile.inc b/src/cpu/intel/fit/Makefile.inc
new file mode 100644
index 0000000000..4b540ba5df
--- /dev/null
+++ b/src/cpu/intel/fit/Makefile.inc
@@ -0,0 +1 @@
+bootblock-y += fit.S
diff --git a/src/cpu/intel/fit/fit.inc b/src/cpu/intel/fit/fit.S
index e4595c0d6d..e4595c0d6d 100644
--- a/src/cpu/intel/fit/fit.inc
+++ b/src/cpu/intel/fit/fit.S