Patchwork Avoid northbridge/southbridge specific rules in generic i386 code

login
register
about
Submitter Patrick Georgi
Date 2010-02-28 20:41:57
Message ID <4B8AD515.60704@georgi-clan.de>
Download mbox | patch
Permalink /patch/994/
State Accepted
Commit r5175
Headers show

Comments

Patrick Georgi - 2010-02-28 20:41:57
Hi,

attached patch makes "bigbootblock" use the romstraps build
infrastructure created for "tinybootblock" (chipset_bootblock_inc and
chipset_bootblock_lds) instead of using chipset specific rules 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>
Stefan Reinauer - 2010-02-28 20:48:31
On 2/28/10 9:41 PM, Patrick Georgi wrote:
> Hi,
>
> attached patch makes "bigbootblock" use the romstraps build
> infrastructure created for "tinybootblock" (chipset_bootblock_inc and
> chipset_bootblock_lds) instead of using chipset specific rules 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>
>   
Lovely.

Acked-by: Stefan Reinauer <stepan@coresystems.de>

Patch

Index: src/southbridge/nvidia/ck804/Makefile.inc
===================================================================
--- src/southbridge/nvidia/ck804/Makefile.inc	(revision 5174)
+++ src/southbridge/nvidia/ck804/Makefile.inc	(working copy)
@@ -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
Index: src/southbridge/sis/sis966/Makefile.inc
===================================================================
--- src/southbridge/sis/sis966/Makefile.inc	(revision 5174)
+++ src/southbridge/sis/sis966/Makefile.inc	(working copy)
@@ -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
Index: src/northbridge/via/vx800/Makefile.inc
===================================================================
--- src/northbridge/via/vx800/Makefile.inc	(revision 5174)
+++ src/northbridge/via/vx800/Makefile.inc	(working copy)
@@ -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
Index: src/arch/i386/Makefile.inc
===================================================================
--- src/arch/i386/Makefile.inc	(revision 5174)
+++ src/arch/i386/Makefile.inc	(working copy)
@@ -154,23 +154,9 @@ 
 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
+crt0s += $(chipset_bootblock_inc)
+ldscripts += $(chipset_bootblock_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
-endif
 
 OPTION_TABLE_H:=
 ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)