summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-09-03 00:41:29 -0500
committerAaron Durbin <adurbin@chromium.org>2015-09-09 03:22:58 +0000
commit3953e3947d375c0552abc45d47a120aaee67d763 (patch)
treea5e5ca1f9c58ff5b89ff0fc4a32e054edbb6d1d1 /src/cpu
parent6c950da54ce2dff7b2874d774147572b95ae82f6 (diff)
x86: bootblock: remove linking and program flow from build system
The build system was previously determining the flow and linking scripts bootblock code by the order of files added to the bootblock_inc bootblock-y variables.Those files were then concatenated together and built by a myriad of make rules. Now bootblock.S and bootblock.ld is added so that bootblock can be built and linked using the default build rules. CHIPSET_BOOTBLOCK_INCLUDE is introduced in order to allow the chipset code to place include files in the path of the bootblock program -- a replacement for the chipset_bootblock_inc make variable. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built vortex, rambi, and some asus boards. Change-Id: Ida4571cbe6eed65e77ade98b8d9ad056353c53f9 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11495 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/dmp/vortex86ex/Kconfig4
-rw-r--r--src/cpu/dmp/vortex86ex/Makefile.inc2
-rw-r--r--src/cpu/dmp/vortex86ex/biosdata.inc2
-rw-r--r--src/cpu/dmp/vortex86ex/chipset_bootblock.inc2
4 files changed, 7 insertions, 3 deletions
diff --git a/src/cpu/dmp/vortex86ex/Kconfig b/src/cpu/dmp/vortex86ex/Kconfig
index 2c893ac766..3bd6c2c96b 100644
--- a/src/cpu/dmp/vortex86ex/Kconfig
+++ b/src/cpu/dmp/vortex86ex/Kconfig
@@ -77,4 +77,8 @@ config PLL_500_375_33
endchoice
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "cpu/dmp/vortex86ex/chipset_bootblock.inc"
+
endif
diff --git a/src/cpu/dmp/vortex86ex/Makefile.inc b/src/cpu/dmp/vortex86ex/Makefile.inc
index 7924ca4229..15ea4ea808 100644
--- a/src/cpu/dmp/vortex86ex/Makefile.inc
+++ b/src/cpu/dmp/vortex86ex/Makefile.inc
@@ -23,8 +23,6 @@ subdirs-y += ../../x86/lapic
subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
-chipset_bootblock_inc += $(src)/cpu/dmp/vortex86ex/biosdata.inc
-chipset_bootblock_inc += $(src)/cpu/dmp/vortex86ex/biosdata_ex.inc
bootblock-y += biosdata.ld
bootblock-y += biosdata_ex.ld
diff --git a/src/cpu/dmp/vortex86ex/biosdata.inc b/src/cpu/dmp/vortex86ex/biosdata.inc
index 5e6a70f50f..4f408b4255 100644
--- a/src/cpu/dmp/vortex86ex/biosdata.inc
+++ b/src/cpu/dmp/vortex86ex/biosdata.inc
@@ -37,7 +37,7 @@
.section ".dmp_kbd_fw_part1", "a", @progbits
- #include "src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc"
+ #include "dmp_kbd_fw_part1.inc"
.previous
diff --git a/src/cpu/dmp/vortex86ex/chipset_bootblock.inc b/src/cpu/dmp/vortex86ex/chipset_bootblock.inc
new file mode 100644
index 0000000000..bdcda1d40f
--- /dev/null
+++ b/src/cpu/dmp/vortex86ex/chipset_bootblock.inc
@@ -0,0 +1,2 @@
+#include "biosdata.inc"
+#include "biosdata_ex.inc"