summaryrefslogtreecommitdiff
path: root/src/northbridge/via
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/northbridge/via
parent6c950da54ce2dff7b2874d774147572b95ae82f6 (diff)
downloadcoreboot-3953e3947d375c0552abc45d47a120aaee67d763.tar.xz
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/northbridge/via')
-rw-r--r--src/northbridge/via/vx800/Kconfig8
-rw-r--r--src/northbridge/via/vx800/Makefile.inc1
-rw-r--r--src/northbridge/via/vx900/Kconfig4
-rw-r--r--src/northbridge/via/vx900/Makefile.inc1
4 files changed, 12 insertions, 2 deletions
diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig
index 9eb84fb14e..d7d5349685 100644
--- a/src/northbridge/via/vx800/Kconfig
+++ b/src/northbridge/via/vx800/Kconfig
@@ -3,3 +3,11 @@ config NORTHBRIDGE_VIA_VX800
select HAVE_DEBUG_RAM_SETUP
select HAVE_DEBUG_SMBUS
select LATE_CBMEM_INIT
+
+if NORTHBRIDGE_VIA_VX800
+
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "northbridge/via/vx800/romstrap.inc"
+
+endif
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index 90ab0affdc..d3c4c7b883 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -25,7 +25,6 @@ ramstage-y += vga.c
ramstage-y += lpc.c
ramstage-y += ide.c
-chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc
bootblock-y += romstrap.ld
endif
diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig
index 617074f52e..335c2652f9 100644
--- a/src/northbridge/via/vx900/Kconfig
+++ b/src/northbridge/via/vx900/Kconfig
@@ -42,4 +42,8 @@ config VGA_BIOS_ID
string
default "1106,7122"
+config CHIPSET_BOOTBLOCK_INCLUDE
+ string
+ default "northbridge/via/vx900/romstrap.inc"
+
endif
diff --git a/src/northbridge/via/vx900/Makefile.inc b/src/northbridge/via/vx900/Makefile.inc
index 6178c114ab..e761f9074d 100644
--- a/src/northbridge/via/vx900/Makefile.inc
+++ b/src/northbridge/via/vx900/Makefile.inc
@@ -46,7 +46,6 @@ ramstage-y += lpc.c
ramstage-y += ./../../../drivers/pc80/vga/vga_io.c
-chipset_bootblock_inc += $(src)/northbridge/via/vx900/romstrap.inc
bootblock-y += romstrap.ld
endif