Change in ...coreboot[master]: nb/intel/pineview: Move the boilerplate mainboard_romstage_entry

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30851

Change subject: nb/intel/pineview: Move the boilerplate mainboard_romstage_entry
......................................................................

nb/intel/pineview: Move the boilerplate mainboard_romstage_entry

The mainboard_romstage_entry function is mostly boilerplate, so move
it to a common location and provide mainboard specific callbacks.

Change-Id: I33cf1d6a60d272f490f41205ec725dee8b00242b
Signed-off-by: Arthur Heymans 
---
M src/mainboard/foxconn/d41s/romstage.c
M src/mainboard/intel/d510mo/romstage.c
M src/northbridge/intel/pineview/Makefile.inc
M src/northbridge/intel/pineview/pineview.h
A src/northbridge/intel/pineview/romstage.c
5 files changed, 140 insertions(+), 192 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/30851/1

diff --git a/src/mainboard/foxconn/d41s/romstage.c b/src/mainboard/foxconn/d41s/romstage.c
index cde813c..ade85e6 100644
--- a/src/mainboard/foxconn/d41s/romstage.c
+++ b/src/mainboard/foxconn/d41s/romstage.c
@@ -15,44 +15,16 @@
  * GNU General Public License for more details.
  */

-#include <stdint.h>
-#include <stdlib.h>
-#include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
-#include <console/console.h>
 #include <southbridge/intel/i82801gx/i82801gx.h>
-#include <southbridge/intel/common/gpio.h>
-#include <northbridge/intel/pineview/raminit.h>
 #include <northbridge/intel/pineview/pineview.h>
-#include <cpu/x86/bist.h>
-#include <cpu/intel/romstage.h>
-#include <cpu/x86/lapic.h>
 #include <superio/ite/common/ite.h>
 #include <superio/ite/it8721f/it8721f.h>
-#include <lib.h>
-#include <cbmem.h>
-#include <romstage_handoff.h>
-#include <timestamp.h>

#define SERIAL_DEV PNP_DEV(0x2e, IT8721F_SP1)

-/* Early mainboard specific GPIO setup */
-static void mb_gpio_init(void)
-{
-	pci_devfn_t dev;
-
-	/* Southbridge GPIOs. */
-	dev = PCI_DEV(0x0, 0x1f, 0x0);
-
-	/* Set the value for GPIO base address register and enable GPIO. */
-	pci_write_config32(dev, GPIO_BASE, (DEFAULT_GPIOBASE | 1));
-	pci_write_config8(dev, GPIO_CNTL, 0x10);
-
-	setup_pch_gpios(&mainboard_gpio_map);
-}
-
-static void nm10_enable_lpc(void)
+void mb_enable_lpc(void)
 {
    /* Disable Serial IRQ */
    pci_write_config8(PCI_DEV(0, 0x1f, 0), SERIRQ_CNTL, 0xd0);
@@ -65,75 +37,12 @@

/* Environment Controller */
    pci_write_config32(PCI_DEV(0, 0x1f, 0), GEN1_DEC, 0x00fc0a01);
-}

-static void rcba_config(void)
-{
-	/* Set up virtual channel 0 */
-	RCBA32(0x0014) = 0x80000001;
-	RCBA32(0x001c) = 0x03128010;
-
-	/* Enable IOAPIC */
-	RCBA8(OIC) = 0x03;
-}
-
-void mainboard_romstage_entry(unsigned long bist)
-{
-	const u8 spd_addrmap[4] = { 0x50, 0x51, 0, 0 };
-	int cbmem_was_initted;
-	int s3resume = 0;
-	int boot_path;
-
-	if (bist == 0)
-		enable_lapic();
-
-	/* Disable watchdog timer */
-	RCBA32(GCS) = RCBA32(GCS) | 0x20;
-
-	/* Set southbridge and Super I/O GPIOs. */
-	mb_gpio_init();
-
-	nm10_enable_lpc();
    ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-	console_init();
+}

-	report_bist_failure(bist);
-	enable_smbus();
-
-	pineview_early_initialization();
-
-	post_code(0x30);
-
-	s3resume = southbridge_detect_s3_resume();
-
-	if (s3resume) {
-		boot_path = BOOT_PATH_RESUME;
-	} else {
-		if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
-			boot_path = BOOT_PATH_RESET;
-		else
-			boot_path = BOOT_PATH_NORMAL;
-	}
-
-	printk(BIOS_DEBUG, "Initializing memory\n");
-	timestamp_add_now(TS_BEFORE_INITRAM);
-	sdram_initialize(boot_path, spd_addrmap);
-	timestamp_add_now(TS_AFTER_INITRAM);
-	printk(BIOS_DEBUG, "Memory initialized\n");
-
-	post_code(0x31);
-
-	quick_ram_check();
-
-	rcba_config();
-
-	cbmem_was_initted = !cbmem_recovery(s3resume);
-
-	if (!cbmem_was_initted && s3resume) {
-		/* Failed S3 resume, reset to come up cleanly */
-		outb(0x6, 0xcf9);
-		halt();
-	}
-
-	romstage_handoff_init(s3resume);
+void get_mb_spd_addrmap(u8 *spd_addrmap)
+{
+	spd_addrmap[0] = 0x50;
+	spd_addrmap[1] = 0x51;
 }
diff --git a/src/mainboard/intel/d510mo/romstage.c b/src/mainboard/intel/d510mo/romstage.c
index 8648e20..f0544be 100644
--- a/src/mainboard/intel/d510mo/romstage.c
+++ b/src/mainboard/intel/d510mo/romstage.c
@@ -14,45 +14,17 @@
  * GNU General Public License for more details.
  */

-#include <stdint.h>
-#include <stdlib.h>
-#include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
-#include <console/console.h>
 #include <southbridge/intel/i82801gx/i82801gx.h>
-#include <southbridge/intel/common/gpio.h>
-#include <northbridge/intel/pineview/raminit.h>
 #include <northbridge/intel/pineview/pineview.h>
-#include <cpu/x86/bist.h>
-#include <cpu/intel/romstage.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/w83627thg/w83627thg.h>
 #include <superio/winbond/common/winbond.h>
-#include <lib.h>
-#include <cbmem.h>
-#include <romstage_handoff.h>
-#include <timestamp.h>

#define SERIAL_DEV PNP_DEV(0x4e, W83627THG_SP1)
 #define SUPERIO_DEV PNP_DEV(0x4e, 0)

-/* Early mainboard specific GPIO setup */
-static void mb_gpio_init(void)
-{
-	pci_devfn_t dev;
-
-	/* Southbridge GPIOs. */
-	dev = PCI_DEV(0x0, 0x1f, 0x0);
-
-	/* Set the value for GPIO base address register and enable GPIO. */
-	pci_write_config32(dev, GPIO_BASE, (DEFAULT_GPIOBASE | 1));
-	pci_write_config8(dev, GPIO_CNTL, 0x10);
-
-	setup_pch_gpios(&mainboard_gpio_map);
-}
-
-static void nm10_enable_lpc(void)
+static void mb_enable_lpc(void)
 {
    /* Disable Serial IRQ */
    pci_write_config8(PCI_DEV(0, 0x1f, 0), SERIRQ_CNTL, 0x00);
@@ -64,14 +36,12 @@
    		| COMB_LPC_EN);

pci_write_config32(PCI_DEV(0, 0x1f, 0), GEN2_DEC, 0x7c0291);
+
+	winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }

-static void rcba_config(void)
+void mb_pirq_setup(void)
 {
-	/* Set up virtual channel 0 */
-	RCBA32(0x0014) = 0x80000001;
-	RCBA32(0x001c) = 0x03128010;
-
    /* dev irq route register */
    RCBA16(D31IR) = 0x0132;
    RCBA16(D30IR) = 0x0146;
@@ -79,69 +49,12 @@
    RCBA16(D28IR) = 0x3201;
    RCBA16(D27IR) = 0x0146;

-	/* Enable IOAPIC */
-	RCBA8(OIC) = 0x03;
-
+	/* Does not belong here, but is it needed? */
    RCBA32(FD) |= FD_INTLAN;
 }

-void mainboard_romstage_entry(unsigned long bist)
+void get_mb_spd_addrmap(u8 *spd_addrmap)
 {
-	const u8 spd_addrmap[4] = { 0x50, 0x51, 0, 0 };
-	int cbmem_was_initted;
-	int s3resume = 0;
-	int boot_path;
-
-	if (bist == 0)
-		enable_lapic();
-
-	/* Disable watchdog timer */
-	RCBA32(GCS) = RCBA32(GCS) | 0x20;
-
-	/* Set southbridge and Super I/O GPIOs. */
-	mb_gpio_init();
-
-	nm10_enable_lpc();
-	winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-	console_init();
-
-	report_bist_failure(bist);
-	enable_smbus();
-
-	pineview_early_initialization();
-
-	post_code(0x30);
-
-	s3resume = southbridge_detect_s3_resume();
-
-	if (s3resume) {
-		boot_path = BOOT_PATH_RESUME;
-	} else {
-		if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
-			boot_path = BOOT_PATH_RESET;
-		else
-			boot_path = BOOT_PATH_NORMAL;
-	}
-
-	printk(BIOS_DEBUG, "Initializing memory\n");
-	timestamp_add_now(TS_BEFORE_INITRAM);
-	sdram_initialize(boot_path, spd_addrmap);
-	timestamp_add_now(TS_AFTER_INITRAM);
-	printk(BIOS_DEBUG, "Memory initialized\n");
-
-	post_code(0x31);
-
-	quick_ram_check();
-
-	rcba_config();
-
-	cbmem_was_initted = !cbmem_recovery(s3resume);
-
-	if (!cbmem_was_initted && s3resume) {
-		/* Failed S3 resume, reset to come up cleanly */
-		outb(0x6, 0xcf9);
-		halt();
-	}
-
-	romstage_handoff_init(s3resume);
+	spd_addrmap[0] = 0x50;
+	spd_addrmap[1] = 0x51;
 }
diff --git a/src/northbridge/intel/pineview/Makefile.inc b/src/northbridge/intel/pineview/Makefile.inc
index d7936c1..524bcae 100644
--- a/src/northbridge/intel/pineview/Makefile.inc
+++ b/src/northbridge/intel/pineview/Makefile.inc
@@ -21,6 +21,7 @@
 ramstage-y += gma.c
 ramstage-y += acpi.c

+romstage-y += romstage.c
 romstage-y += ram_calc.c
 romstage-y += raminit.c
 romstage-y += early_init.c
diff --git a/src/northbridge/intel/pineview/pineview.h b/src/northbridge/intel/pineview/pineview.h
index 9873d4d..7378a78 100644
--- a/src/northbridge/intel/pineview/pineview.h
+++ b/src/northbridge/intel/pineview/pineview.h
@@ -235,6 +235,11 @@
 u32 decode_igd_gtt_size(const u32 gsm);
 u8 decode_pciebar(u32 *const base, u32 *const len);

+/* Mainboard romstage callback */
+void mb_enable_lpc(void);
+void get_mb_spd_addrmap(u8 *spd_addr_map);
+void mb_pirq_setup(void); /* optional */
+
 /* provided by mainboard code */
 void setup_ich7_gpios(void);

diff --git a/src/northbridge/intel/pineview/romstage.c b/src/northbridge/intel/pineview/romstage.c
new file mode 100644
index 0000000..10ac0f5
--- /dev/null
+++ b/src/northbridge/intel/pineview/romstage.c
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015  Damien Zammit 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* Platform has no romstage entry point under mainboard directory,
+ * so this one is named with prefix mainboard.
+ */
+
+#include <lib.h>
+#include <timestamp.h>
+#include <console/console.h>
+#include <cbmem.h>
+#include <romstage_handoff.h>
+#include <southbridge/intel/i82801gx/i82801gx.h>
+#include <southbridge/intel/common/gpio.h>
+#include <cpu/intel/romstage.h>
+#include <cpu/x86/bist.h>
+#include <cpu/x86/lapic.h>
+#include "raminit.h"
+#include "pineview.h"
+
+static void rcba_config(void)
+{
+	/* Set up virtual channel 0 */
+	RCBA32(0x0014) = 0x80000001;
+	RCBA32(0x001c) = 0x03128010;
+
+	/* Enable IOAPIC */
+	RCBA8(OIC) = 0x03;
+}
+
+__weak void mb_pirq_setup(void)
+{
+}
+
+#define LPC_DEV PCI_DEV(0x0, 0x1f, 0x0)
+
+void mainboard_romstage_entry(unsigned long bist)
+{
+	u8 spd_addrmap[4] = {};
+	int boot_path, cbmem_was_initted;
+	int s3resume = 0;
+
+	if (bist == 0)
+		enable_lapic();
+
+	/* Disable watchdog timer */
+	RCBA32(GCS) = RCBA32(GCS) | 0x20;
+
+	/* Enable GPIOs */
+	pci_write_config32(LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE | 1);
+	pci_write_config8(LPC_DEV, GPIO_CNTL, 0x10);
+
+	setup_pch_gpios(&mainboard_gpio_map);
+
+	mb_enable_lpc(); // nm10_enable_lpc
+
+	/* Initialize console device(s) */
+	console_init();
+
+	/* Halt if there was a built in self test failure */
+	report_bist_failure(bist);
+
+	enable_smbus();
+
+	/* Perform some early chipset initialization required
+	 * before RAM initialization can work
+	 */
+	pineview_early_initialization();
+
+	post_code(0x30);
+
+	s3resume = southbridge_detect_s3_resume();
+
+	if (s3resume) {
+		boot_path = BOOT_PATH_RESUME;
+	} else {
+		if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
+			boot_path = BOOT_PATH_RESET;
+		else
+			boot_path = BOOT_PATH_NORMAL;
+	}
+
+	get_mb_spd_addrmap(&spd_addrmap[0]);
+
+	printk(BIOS_DEBUG, "Initializing memory\n");
+	timestamp_add_now(TS_BEFORE_INITRAM);
+	sdram_initialize(boot_path, spd_addrmap);
+	timestamp_add_now(TS_AFTER_INITRAM);
+	printk(BIOS_DEBUG, "Memory initialized\n");
+
+	post_code(0x31);
+
+	quick_ram_check();
+
+	mb_pirq_setup();
+
+	rcba_config();
+
+	cbmem_was_initted = !cbmem_recovery(s3resume);
+
+	if (!cbmem_was_initted && s3resume) {
+		/* Failed S3 resume, reset to come up cleanly */
+		outb(0x6, 0xcf9);
+		halt();
+	}
+
+	romstage_handoff_init(s3resume);
+}

[Arthur Heymans (Code Review)]

Hello Patrick Rudolph, build bot (Jenkins), Damien Zammit, Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/30851

to look at the new patch set (#2).

Change subject: nb/intel/pineview: Move the boilerplate mainboard_romstage_entry
......................................................................

nb/intel/pineview: Move the boilerplate mainboard_romstage_entry

The mainboard_romstage_entry function is mostly boilerplate, so move
it to a common location and provide mainboard specific callbacks.

Change-Id: I33cf1d6a60d272f490f41205ec725dee8b00242b
Signed-off-by: Arthur Heymans 
---
M src/mainboard/foxconn/d41s/romstage.c
M src/mainboard/intel/d510mo/romstage.c
M src/northbridge/intel/pineview/Makefile.inc
M src/northbridge/intel/pineview/pineview.h
A src/northbridge/intel/pineview/romstage.c
5 files changed, 140 insertions(+), 192 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/30851/2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30851 )

Change subject: nb/intel/pineview: Move the boilerplate mainboard_romstage_entry
......................................................................

Patch Set 2: Code-Review+1

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30851 )

Change subject: nb/intel/pineview: Move the boilerplate mainboard_romstage_entry
......................................................................

Patch Set 2: Code-Review+2

(2 comments)

https://review.coreboot.org/#/c/30851/2/src/northbridge/intel/pineview/romst... 
File src/northbridge/intel/pineview/romstage.c:

https://review.coreboot.org/#/c/30851/2/src/northbridge/intel/pineview/romst... 
PS2, Line 98: 	timestamp_add_now(TS_BEFORE_INITRAM);
This commit of followup, move to ramininit.c

https://review.coreboot.org/#/c/30851/2/src/northbridge/intel/pineview/romst... 
PS2, Line 105: 	quick_ram_check();
Move to raminit.c

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30851 )

Change subject: nb/intel/pineview: Move the boilerplate mainboard_romstage_entry
......................................................................

nb/intel/pineview: Move the boilerplate mainboard_romstage_entry

The mainboard_romstage_entry function is mostly boilerplate, so move
it to a common location and provide mainboard specific callbacks.

Change-Id: I33cf1d6a60d272f490f41205ec725dee8b00242b
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/30851
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Kyösti Mälkki 
---
M src/mainboard/foxconn/d41s/romstage.c
M src/mainboard/intel/d510mo/romstage.c
M src/northbridge/intel/pineview/Makefile.inc
M src/northbridge/intel/pineview/pineview.h
A src/northbridge/intel/pineview/romstage.c
5 files changed, 140 insertions(+), 192 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/src/mainboard/foxconn/d41s/romstage.c b/src/mainboard/foxconn/d41s/romstage.c
index cde813c..ade85e6 100644
--- a/src/mainboard/foxconn/d41s/romstage.c
+++ b/src/mainboard/foxconn/d41s/romstage.c
@@ -15,44 +15,16 @@
  * GNU General Public License for more details.
  */

-#include <stdint.h>
-#include <stdlib.h>
-#include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
-#include <console/console.h>
 #include <southbridge/intel/i82801gx/i82801gx.h>
-#include <southbridge/intel/common/gpio.h>
-#include <northbridge/intel/pineview/raminit.h>
 #include <northbridge/intel/pineview/pineview.h>
-#include <cpu/x86/bist.h>
-#include <cpu/intel/romstage.h>
-#include <cpu/x86/lapic.h>
 #include <superio/ite/common/ite.h>
 #include <superio/ite/it8721f/it8721f.h>
-#include <lib.h>
-#include <cbmem.h>
-#include <romstage_handoff.h>
-#include <timestamp.h>

#define SERIAL_DEV PNP_DEV(0x2e, IT8721F_SP1)

-/* Early mainboard specific GPIO setup */
-static void mb_gpio_init(void)
-{
-	pci_devfn_t dev;
-
-	/* Southbridge GPIOs. */
-	dev = PCI_DEV(0x0, 0x1f, 0x0);
-
-	/* Set the value for GPIO base address register and enable GPIO. */
-	pci_write_config32(dev, GPIO_BASE, (DEFAULT_GPIOBASE | 1));
-	pci_write_config8(dev, GPIO_CNTL, 0x10);
-
-	setup_pch_gpios(&mainboard_gpio_map);
-}
-
-static void nm10_enable_lpc(void)
+void mb_enable_lpc(void)
 {
    /* Disable Serial IRQ */
    pci_write_config8(PCI_DEV(0, 0x1f, 0), SERIRQ_CNTL, 0xd0);
@@ -65,75 +37,12 @@

/* Environment Controller */
    pci_write_config32(PCI_DEV(0, 0x1f, 0), GEN1_DEC, 0x00fc0a01);
-}

-static void rcba_config(void)
-{
-	/* Set up virtual channel 0 */
-	RCBA32(0x0014) = 0x80000001;
-	RCBA32(0x001c) = 0x03128010;
-
-	/* Enable IOAPIC */
-	RCBA8(OIC) = 0x03;
-}
-
-void mainboard_romstage_entry(unsigned long bist)
-{
-	const u8 spd_addrmap[4] = { 0x50, 0x51, 0, 0 };
-	int cbmem_was_initted;
-	int s3resume = 0;
-	int boot_path;
-
-	if (bist == 0)
-		enable_lapic();
-
-	/* Disable watchdog timer */
-	RCBA32(GCS) = RCBA32(GCS) | 0x20;
-
-	/* Set southbridge and Super I/O GPIOs. */
-	mb_gpio_init();
-
-	nm10_enable_lpc();
    ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-	console_init();
+}

-	report_bist_failure(bist);
-	enable_smbus();
-
-	pineview_early_initialization();
-
-	post_code(0x30);
-
-	s3resume = southbridge_detect_s3_resume();
-
-	if (s3resume) {
-		boot_path = BOOT_PATH_RESUME;
-	} else {
-		if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
-			boot_path = BOOT_PATH_RESET;
-		else
-			boot_path = BOOT_PATH_NORMAL;
-	}
-
-	printk(BIOS_DEBUG, "Initializing memory\n");
-	timestamp_add_now(TS_BEFORE_INITRAM);
-	sdram_initialize(boot_path, spd_addrmap);
-	timestamp_add_now(TS_AFTER_INITRAM);
-	printk(BIOS_DEBUG, "Memory initialized\n");
-
-	post_code(0x31);
-
-	quick_ram_check();
-
-	rcba_config();
-
-	cbmem_was_initted = !cbmem_recovery(s3resume);
-
-	if (!cbmem_was_initted && s3resume) {
-		/* Failed S3 resume, reset to come up cleanly */
-		outb(0x6, 0xcf9);
-		halt();
-	}
-
-	romstage_handoff_init(s3resume);
+void get_mb_spd_addrmap(u8 *spd_addrmap)
+{
+	spd_addrmap[0] = 0x50;
+	spd_addrmap[1] = 0x51;
 }
diff --git a/src/mainboard/intel/d510mo/romstage.c b/src/mainboard/intel/d510mo/romstage.c
index 8648e20..28e2e25 100644
--- a/src/mainboard/intel/d510mo/romstage.c
+++ b/src/mainboard/intel/d510mo/romstage.c
@@ -14,45 +14,17 @@
  * GNU General Public License for more details.
  */

-#include <stdint.h>
-#include <stdlib.h>
-#include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
-#include <console/console.h>
 #include <southbridge/intel/i82801gx/i82801gx.h>
-#include <southbridge/intel/common/gpio.h>
-#include <northbridge/intel/pineview/raminit.h>
 #include <northbridge/intel/pineview/pineview.h>
-#include <cpu/x86/bist.h>
-#include <cpu/intel/romstage.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/w83627thg/w83627thg.h>
 #include <superio/winbond/common/winbond.h>
-#include <lib.h>
-#include <cbmem.h>
-#include <romstage_handoff.h>
-#include <timestamp.h>

#define SERIAL_DEV PNP_DEV(0x4e, W83627THG_SP1)
 #define SUPERIO_DEV PNP_DEV(0x4e, 0)

-/* Early mainboard specific GPIO setup */
-static void mb_gpio_init(void)
-{
-	pci_devfn_t dev;
-
-	/* Southbridge GPIOs. */
-	dev = PCI_DEV(0x0, 0x1f, 0x0);
-
-	/* Set the value for GPIO base address register and enable GPIO. */
-	pci_write_config32(dev, GPIO_BASE, (DEFAULT_GPIOBASE | 1));
-	pci_write_config8(dev, GPIO_CNTL, 0x10);
-
-	setup_pch_gpios(&mainboard_gpio_map);
-}
-
-static void nm10_enable_lpc(void)
+void mb_enable_lpc(void)
 {
    /* Disable Serial IRQ */
    pci_write_config8(PCI_DEV(0, 0x1f, 0), SERIRQ_CNTL, 0x00);
@@ -64,14 +36,12 @@
    		| COMB_LPC_EN);

pci_write_config32(PCI_DEV(0, 0x1f, 0), GEN2_DEC, 0x7c0291);
+
+	winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }

-static void rcba_config(void)
+void mb_pirq_setup(void)
 {
-	/* Set up virtual channel 0 */
-	RCBA32(0x0014) = 0x80000001;
-	RCBA32(0x001c) = 0x03128010;
-
    /* dev irq route register */
    RCBA16(D31IR) = 0x0132;
    RCBA16(D30IR) = 0x0146;
@@ -79,69 +49,12 @@
    RCBA16(D28IR) = 0x3201;
    RCBA16(D27IR) = 0x0146;

-	/* Enable IOAPIC */
-	RCBA8(OIC) = 0x03;
-
+	/* Does not belong here, but is it needed? */
    RCBA32(FD) |= FD_INTLAN;
 }

-void mainboard_romstage_entry(unsigned long bist)
+void get_mb_spd_addrmap(u8 *spd_addrmap)
 {
-	const u8 spd_addrmap[4] = { 0x50, 0x51, 0, 0 };
-	int cbmem_was_initted;
-	int s3resume = 0;
-	int boot_path;
-
-	if (bist == 0)
-		enable_lapic();
-
-	/* Disable watchdog timer */
-	RCBA32(GCS) = RCBA32(GCS) | 0x20;
-
-	/* Set southbridge and Super I/O GPIOs. */
-	mb_gpio_init();
-
-	nm10_enable_lpc();
-	winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-	console_init();
-
-	report_bist_failure(bist);
-	enable_smbus();
-
-	pineview_early_initialization();
-
-	post_code(0x30);
-
-	s3resume = southbridge_detect_s3_resume();
-
-	if (s3resume) {
-		boot_path = BOOT_PATH_RESUME;
-	} else {
-		if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
-			boot_path = BOOT_PATH_RESET;
-		else
-			boot_path = BOOT_PATH_NORMAL;
-	}
-
-	printk(BIOS_DEBUG, "Initializing memory\n");
-	timestamp_add_now(TS_BEFORE_INITRAM);
-	sdram_initialize(boot_path, spd_addrmap);
-	timestamp_add_now(TS_AFTER_INITRAM);
-	printk(BIOS_DEBUG, "Memory initialized\n");
-
-	post_code(0x31);
-
-	quick_ram_check();
-
-	rcba_config();
-
-	cbmem_was_initted = !cbmem_recovery(s3resume);
-
-	if (!cbmem_was_initted && s3resume) {
-		/* Failed S3 resume, reset to come up cleanly */
-		outb(0x6, 0xcf9);
-		halt();
-	}
-
-	romstage_handoff_init(s3resume);
+	spd_addrmap[0] = 0x50;
+	spd_addrmap[1] = 0x51;
 }
diff --git a/src/northbridge/intel/pineview/Makefile.inc b/src/northbridge/intel/pineview/Makefile.inc
index d7936c1..524bcae 100644
--- a/src/northbridge/intel/pineview/Makefile.inc
+++ b/src/northbridge/intel/pineview/Makefile.inc
@@ -21,6 +21,7 @@
 ramstage-y += gma.c
 ramstage-y += acpi.c

+romstage-y += romstage.c
 romstage-y += ram_calc.c
 romstage-y += raminit.c
 romstage-y += early_init.c
diff --git a/src/northbridge/intel/pineview/pineview.h b/src/northbridge/intel/pineview/pineview.h
index 8c32e17..65d21cf 100644
--- a/src/northbridge/intel/pineview/pineview.h
+++ b/src/northbridge/intel/pineview/pineview.h
@@ -235,6 +235,11 @@
 u32 decode_igd_gtt_size(const u32 gsm);
 u8 decode_pciebar(u32 *const base, u32 *const len);

+/* Mainboard romstage callback functions */
+void mb_enable_lpc(void);
+void get_mb_spd_addrmap(u8 *spd_addr_map);
+void mb_pirq_setup(void); /* optional */
+
 struct acpi_rsdp;
 unsigned long northbridge_write_acpi_tables(unsigned long start, struct acpi_rsdp *rsdp);

diff --git a/src/northbridge/intel/pineview/romstage.c b/src/northbridge/intel/pineview/romstage.c
new file mode 100644
index 0000000..10ac0f5
--- /dev/null
+++ b/src/northbridge/intel/pineview/romstage.c
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015  Damien Zammit 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* Platform has no romstage entry point under mainboard directory,
+ * so this one is named with prefix mainboard.
+ */
+
+#include <lib.h>
+#include <timestamp.h>
+#include <console/console.h>
+#include <cbmem.h>
+#include <romstage_handoff.h>
+#include <southbridge/intel/i82801gx/i82801gx.h>
+#include <southbridge/intel/common/gpio.h>
+#include <cpu/intel/romstage.h>
+#include <cpu/x86/bist.h>
+#include <cpu/x86/lapic.h>
+#include "raminit.h"
+#include "pineview.h"
+
+static void rcba_config(void)
+{
+	/* Set up virtual channel 0 */
+	RCBA32(0x0014) = 0x80000001;
+	RCBA32(0x001c) = 0x03128010;
+
+	/* Enable IOAPIC */
+	RCBA8(OIC) = 0x03;
+}
+
+__weak void mb_pirq_setup(void)
+{
+}
+
+#define LPC_DEV PCI_DEV(0x0, 0x1f, 0x0)
+
+void mainboard_romstage_entry(unsigned long bist)
+{
+	u8 spd_addrmap[4] = {};
+	int boot_path, cbmem_was_initted;
+	int s3resume = 0;
+
+	if (bist == 0)
+		enable_lapic();
+
+	/* Disable watchdog timer */
+	RCBA32(GCS) = RCBA32(GCS) | 0x20;
+
+	/* Enable GPIOs */
+	pci_write_config32(LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE | 1);
+	pci_write_config8(LPC_DEV, GPIO_CNTL, 0x10);
+
+	setup_pch_gpios(&mainboard_gpio_map);
+
+	mb_enable_lpc(); // nm10_enable_lpc
+
+	/* Initialize console device(s) */
+	console_init();
+
+	/* Halt if there was a built in self test failure */
+	report_bist_failure(bist);
+
+	enable_smbus();
+
+	/* Perform some early chipset initialization required
+	 * before RAM initialization can work
+	 */
+	pineview_early_initialization();
+
+	post_code(0x30);
+
+	s3resume = southbridge_detect_s3_resume();
+
+	if (s3resume) {
+		boot_path = BOOT_PATH_RESUME;
+	} else {
+		if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
+			boot_path = BOOT_PATH_RESET;
+		else
+			boot_path = BOOT_PATH_NORMAL;
+	}
+
+	get_mb_spd_addrmap(&spd_addrmap[0]);
+
+	printk(BIOS_DEBUG, "Initializing memory\n");
+	timestamp_add_now(TS_BEFORE_INITRAM);
+	sdram_initialize(boot_path, spd_addrmap);
+	timestamp_add_now(TS_AFTER_INITRAM);
+	printk(BIOS_DEBUG, "Memory initialized\n");
+
+	post_code(0x31);
+
+	quick_ram_check();
+
+	mb_pirq_setup();
+
+	rcba_config();
+
+	cbmem_was_initted = !cbmem_recovery(s3resume);
+
+	if (!cbmem_was_initted && s3resume) {
+		/* Failed S3 resume, reset to come up cleanly */
+		outb(0x6, 0xcf9);
+		halt();
+	}
+
+	romstage_handoff_init(s3resume);
+}