From 806a29eb1909cc4df0fb4bdb0f25083976c3ea6c Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 28 Feb 2010 20:56:42 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5175 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/Makefile.inc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/arch') diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index 5e6e194a9e..22318956f3 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -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:= -- cgit v1.2.3