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>
This commit is contained in:
@@ -77,4 +77,8 @@ config PLL_500_375_33
|
||||
|
||||
endchoice
|
||||
|
||||
config CHIPSET_BOOTBLOCK_INCLUDE
|
||||
string
|
||||
default "cpu/dmp/vortex86ex/chipset_bootblock.inc"
|
||||
|
||||
endif
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
2
src/cpu/dmp/vortex86ex/chipset_bootblock.inc
Normal file
2
src/cpu/dmp/vortex86ex/chipset_bootblock.inc
Normal file
@@ -0,0 +1,2 @@
|
||||
#include "biosdata.inc"
|
||||
#include "biosdata_ex.inc"
|
Reference in New Issue
Block a user