Merge enable_rom.c files into bootblock.c files.

[coreboot.git] / src / southbridge / broadcom / bcm5785 / bootblock.c

diff --git a/src/southbridge/broadcom/bcm5785/bootblock.c b/src/southbridge/broadcom/bcm5785/bootblock.c
index f51fcd0ff9bbb0197a366cd616fb4806e880cf3d..cadda5359625aec89ed90ef9dd76ff16bcd54091 100644 (file)
--- a/src/southbridge/broadcom/bcm5785/bootblock.c
+++ b/src/southbridge/broadcom/bcm5785/bootblock.c
@@ -18,7 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "enable_rom.c"
+#include <stdint.h>
+#include <arch/io.h>
+#include <arch/romcc_io.h>
+#include <device/pci_ids.h>
+
+/* Enable 4MB ROM access at 0xFFC00000 - 0xFFFFFFFF. */
+static void bcm5785_enable_rom(void)
+{
+       u8 byte;
+       device_t dev;
+
+       dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_SERVERWORKS,
+                       PCI_DEVICE_ID_SERVERWORKS_BCM5785_SB_PCI_MAIN), 0);
+
+       /* Set the 4MB enable bits. */
+       byte = pci_read_config8(dev, 0x41);
+       byte |= 0x0e;
+       pci_write_config8(dev, 0x41, byte);
+}
 
 static void bootblock_southbridge_init(void)
 {