Use the romstraps build infrastructure created for "tinybootblock"

(chipset_bootblock_inc and chipset_bootblock_lds) instead of using
chipset specific rules for "bigbootblock" in the generic i386 Makefile.

It also adds rules for the romstraps of
* southbridge/nvidia/ck804
* southbridge/sis/sis966
* northbridge/via/vx800
for the benefit of both image layouts.


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5175 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2010-02-28 20:56:42 +00:00
parent 43fed9b4ed
commit 806a29eb19
4 changed files with 10 additions and 16 deletions

View File

@ -154,22 +154,8 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
endif
ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
ifeq ($(CONFIG_SOUTHBRIDGE_NVIDIA_CK804),y)
crt0s += $(src)/southbridge/nvidia/ck804/romstrap.inc
ldscripts += $(src)/southbridge/nvidia/ck804/romstrap.lds
endif
ifeq ($(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55),y)
crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
endif
ifeq ($(CONFIG_SOUTHBRIDGE_VIA_K8T890),y)
crt0s += $(src)/southbridge/via/k8t890/romstrap.inc
ldscripts += $(src)/southbridge/via/k8t890/romstrap.lds
endif
ifeq ($(CONFIG_NORTHBRIDGE_VIA_VX800),y)
crt0s += $(src)/northbridge/via/vx800/romstrap.inc
ldscripts += $(src)/northbridge/via/vx800/romstrap.lds
endif
crt0s += $(chipset_bootblock_inc)
ldscripts += $(chipset_bootblock_lds)
endif
OPTION_TABLE_H:=

View File

@ -25,3 +25,5 @@ driver-y += vga.o
driver-y += vx800_lpc.o
driver-y += vx800_ide.o
chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc
chipset_bootblock_lds += $(src)/northbridge/via/vx800/romstrap.lds

View File

@ -14,3 +14,6 @@ driver-y += ck804_ht.o
obj-y += ck804_reset.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ck804_fadt.o
chipset_bootblock_inc += $(src)/southbridge/nvidia/ck804/romstrap.inc
chipset_bootblock_lds += $(src)/southbridge/nvidia/ck804/romstrap.lds

View File

@ -9,3 +9,6 @@ driver-y += sis966_sata.o
driver-y += sis966_pcie.o
driver-y += sis966_aza.o
obj-y += sis966_reset.o
chipset_bootblock_inc += $(src)/southbridge/sis/sis966/romstrap.inc
chipset_bootblock_lds += $(src)/southbridge/sis/sis966/romstrap.lds