[commit] r5175 - in trunk/src: arch/i386 northbridge/via/vx800 southbridge/nvidia/ck804 southbridge/sis/sis966

[repository service]

Author: oxygene
Date: Sun Feb 28 21:56:42 2010
New Revision: 5175
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5175

Log:
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 <[e-mail]>
Acked-by: Stefan Reinauer <[e-mail]>

Modified:
   trunk/src/arch/i386/Makefile.inc
   trunk/src/northbridge/via/vx800/Makefile.inc
   trunk/src/southbridge/nvidia/ck804/Makefile.inc
   trunk/src/southbridge/sis/sis966/Makefile.inc

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Sun Feb 28 20:40:03 2010	(r5174)
+++ trunk/src/arch/i386/Makefile.inc	Sun Feb 28 21:56:42 2010	(r5175)
@@ -154,22 +154,8 @@
 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:=

Modified: trunk/src/northbridge/via/vx800/Makefile.inc
==============================================================================
--- trunk/src/northbridge/via/vx800/Makefile.inc	Sun Feb 28 20:40:03 2010	(r5174)
+++ trunk/src/northbridge/via/vx800/Makefile.inc	Sun Feb 28 21:56:42 2010	(r5175)
@@ -25,3 +25,5 @@
 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

Modified: trunk/src/southbridge/nvidia/ck804/Makefile.inc
==============================================================================
--- trunk/src/southbridge/nvidia/ck804/Makefile.inc	Sun Feb 28 20:40:03 2010	(r5174)
+++ trunk/src/southbridge/nvidia/ck804/Makefile.inc	Sun Feb 28 21:56:42 2010	(r5175)
@@ -14,3 +14,6 @@
 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

Modified: trunk/src/southbridge/sis/sis966/Makefile.inc
==============================================================================
--- trunk/src/southbridge/sis/sis966/Makefile.inc	Sun Feb 28 20:40:03 2010	(r5174)
+++ trunk/src/southbridge/sis/sis966/Makefile.inc	Sun Feb 28 21:56:42 2010	(r5175)
@@ -9,3 +9,6 @@
 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