[commit] r5990 - in trunk/src: mainboard/broadcom/blast mainboard/hp/dl145_g3 mainboard/hp/dl165_g6_fam10 mainboard/msi/ms9185 southbridge/broadcom/bcm5785

[repository service]

Author: oxygene
Date: Tue Oct 26 17:51:57 2010
New Revision: 5990
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5990

Log:
Move bcm5785_enable_rom.c include to where it's used.
Right now, it breaks the build of bootblock enabled boards
with that chipset.

Signed-off-by: Patrick Georgi 
Acked-by: Patrick Georgi

Modified:
   trunk/src/mainboard/broadcom/blast/romstage.c
   trunk/src/mainboard/hp/dl145_g3/romstage.c
   trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c
   trunk/src/mainboard/msi/ms9185/romstage.c
   trunk/src/southbridge/broadcom/bcm5785/bcm5785_early_setup.c

Modified: trunk/src/mainboard/broadcom/blast/romstage.c
==============================================================================
--- trunk/src/mainboard/broadcom/blast/romstage.c	Tue Oct 26 17:11:45 2010	(r5989)
+++ trunk/src/mainboard/broadcom/blast/romstage.c	Tue Oct 26 17:51:57 2010	(r5990)
@@ -17,6 +17,7 @@
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
+#include "southbridge/broadcom/bcm5785/bcm5785_enable_rom.c"
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
 #include "lib/delay.c"

Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c
==============================================================================
--- trunk/src/mainboard/hp/dl145_g3/romstage.c	Tue Oct 26 17:11:45 2010	(r5989)
+++ trunk/src/mainboard/hp/dl145_g3/romstage.c	Tue Oct 26 17:51:57 2010	(r5990)
@@ -57,6 +57,7 @@
 #include <cpu/amd/model_fxx_rev.h>

#include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
+#include "southbridge/broadcom/bcm5785/bcm5785_enable_rom.c"
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
 #include "lib/delay.c"

Modified: trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c	Tue Oct 26 17:11:45 2010	(r5989)
+++ trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c	Tue Oct 26 17:51:57 2010	(r5990)
@@ -49,6 +49,7 @@
 #include <console/console.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
+#include "southbridge/broadcom/bcm5785/bcm5785_enable_rom.c"
 #include "northbridge/amd/amdfam10/raminit.h"
 #include "northbridge/amd/amdfam10/amdfam10.h"
 #include <lib.h>

Modified: trunk/src/mainboard/msi/ms9185/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms9185/romstage.c	Tue Oct 26 17:11:45 2010	(r5989)
+++ trunk/src/mainboard/msi/ms9185/romstage.c	Tue Oct 26 17:51:57 2010	(r5990)
@@ -49,6 +49,7 @@

#include <cpu/amd/model_fxx_rev.h>
 #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
+#include "southbridge/broadcom/bcm5785/bcm5785_enable_rom.c"
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
 #include "lib/delay.c"

Modified: trunk/src/southbridge/broadcom/bcm5785/bcm5785_early_setup.c
==============================================================================
--- trunk/src/southbridge/broadcom/bcm5785/bcm5785_early_setup.c	Tue Oct 26 17:11:45 2010	(r5989)
+++ trunk/src/southbridge/broadcom/bcm5785/bcm5785_early_setup.c	Tue Oct 26 17:51:57 2010	(r5990)
@@ -20,7 +20,6 @@

#include <reset.h>
 #include "bcm5785.h"
-#include "bcm5785_enable_rom.c"

static void bcm5785_enable_lpc(void)
 {