summaryrefslogtreecommitdiff
path: root/src/mainboard/hp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/hp')
-rw-r--r--src/mainboard/hp/2570p/Makefile.inc2
-rw-r--r--src/mainboard/hp/2570p/early_init.c (renamed from src/mainboard/hp/2570p/romstage.c)3
-rw-r--r--src/mainboard/hp/2760p/Makefile.inc2
-rw-r--r--src/mainboard/hp/2760p/early_init.c (renamed from src/mainboard/hp/2760p/romstage.c)3
-rw-r--r--src/mainboard/hp/8460p/Makefile.inc2
-rw-r--r--src/mainboard/hp/8460p/early_init.c (renamed from src/mainboard/hp/8460p/romstage.c)3
-rw-r--r--src/mainboard/hp/8470p/Makefile.inc2
-rw-r--r--src/mainboard/hp/8470p/early_init.c (renamed from src/mainboard/hp/8470p/romstage.c)3
-rw-r--r--src/mainboard/hp/8770w/Makefile.inc2
-rw-r--r--src/mainboard/hp/8770w/early_init.c (renamed from src/mainboard/hp/8770w/romstage.c)3
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc2
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/early_init.c (renamed from src/mainboard/hp/compaq_8200_elite_sff/romstage.c)3
-rw-r--r--src/mainboard/hp/folio_9470m/Makefile.inc2
-rw-r--r--src/mainboard/hp/folio_9470m/early_init.c (renamed from src/mainboard/hp/folio_9470m/romstage.c)3
-rw-r--r--src/mainboard/hp/revolve_810_g1/Makefile.inc2
-rw-r--r--src/mainboard/hp/revolve_810_g1/early_init.c (renamed from src/mainboard/hp/revolve_810_g1/romstage.c)3
-rw-r--r--src/mainboard/hp/z220_sff_workstation/Makefile.inc2
-rw-r--r--src/mainboard/hp/z220_sff_workstation/early_init.c (renamed from src/mainboard/hp/z220_sff_workstation/romstage.c)3
18 files changed, 36 insertions, 9 deletions
diff --git a/src/mainboard/hp/2570p/Makefile.inc b/src/mainboard/hp/2570p/Makefile.inc
index 4fbf73bbd3..1d258758be 100644
--- a/src/mainboard/hp/2570p/Makefile.inc
+++ b/src/mainboard/hp/2570p/Makefile.inc
@@ -17,3 +17,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/2570p/romstage.c b/src/mainboard/hp/2570p/early_init.c
index f1d1e905f3..226367a569 100644
--- a/src/mainboard/hp/2570p/romstage.c
+++ b/src/mainboard/hp/2570p/early_init.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
@@ -37,7 +38,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 0, 0, 6 },
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
kbc1126_enter_conf();
kbc1126_mailbox_init();
diff --git a/src/mainboard/hp/2760p/Makefile.inc b/src/mainboard/hp/2760p/Makefile.inc
index 4fbf73bbd3..1d258758be 100644
--- a/src/mainboard/hp/2760p/Makefile.inc
+++ b/src/mainboard/hp/2760p/Makefile.inc
@@ -17,3 +17,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/2760p/romstage.c b/src/mainboard/hp/2760p/early_init.c
index acf5b1895a..98806de9f4 100644
--- a/src/mainboard/hp/2760p/romstage.c
+++ b/src/mainboard/hp/2760p/early_init.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
@@ -36,7 +37,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 1, 6 },
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
kbc1126_enter_conf();
kbc1126_mailbox_init();
diff --git a/src/mainboard/hp/8460p/Makefile.inc b/src/mainboard/hp/8460p/Makefile.inc
index 4fbf73bbd3..1d258758be 100644
--- a/src/mainboard/hp/8460p/Makefile.inc
+++ b/src/mainboard/hp/8460p/Makefile.inc
@@ -17,3 +17,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/8460p/romstage.c b/src/mainboard/hp/8460p/early_init.c
index 4e4b175366..9c2a4b1139 100644
--- a/src/mainboard/hp/8460p/romstage.c
+++ b/src/mainboard/hp/8460p/early_init.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
@@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, 6 }, /* docking */
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
kbc1126_enter_conf();
diff --git a/src/mainboard/hp/8470p/Makefile.inc b/src/mainboard/hp/8470p/Makefile.inc
index 4fbf73bbd3..1d258758be 100644
--- a/src/mainboard/hp/8470p/Makefile.inc
+++ b/src/mainboard/hp/8470p/Makefile.inc
@@ -17,3 +17,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/8470p/romstage.c b/src/mainboard/hp/8470p/early_init.c
index 8c9b29ef01..8dbe15815d 100644
--- a/src/mainboard/hp/8470p/romstage.c
+++ b/src/mainboard/hp/8470p/early_init.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
@@ -39,7 +40,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, 6 },
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
kbc1126_enter_conf();
diff --git a/src/mainboard/hp/8770w/Makefile.inc b/src/mainboard/hp/8770w/Makefile.inc
index 910d6a6191..f4b387abed 100644
--- a/src/mainboard/hp/8770w/Makefile.inc
+++ b/src/mainboard/hp/8770w/Makefile.inc
@@ -15,3 +15,5 @@
bootblock-y += gpio.c
romstage-y += gpio.c
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/8770w/romstage.c b/src/mainboard/hp/8770w/early_init.c
index 8eefe4d6a2..3bd2ed7f51 100644
--- a/src/mainboard/hp/8770w/romstage.c
+++ b/src/mainboard/hp/8770w/early_init.c
@@ -14,6 +14,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
@@ -40,7 +41,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, 6 }, /* Conn (eSATA Combo) */
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
kbc1126_enter_conf();
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
index af2b6742f0..f0b34f9840 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
@@ -1,3 +1,5 @@
bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c b/src/mainboard/hp/compaq_8200_elite_sff/early_init.c
index df581fe542..882a604899 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c
+++ b/src/mainboard/hp/compaq_8200_elite_sff/early_init.c
@@ -16,6 +16,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <stdint.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
@@ -44,7 +45,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, -1 },
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
if (CONFIG(CONSOLE_SERIAL))
nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/hp/folio_9470m/Makefile.inc b/src/mainboard/hp/folio_9470m/Makefile.inc
index 4fbf73bbd3..1d258758be 100644
--- a/src/mainboard/hp/folio_9470m/Makefile.inc
+++ b/src/mainboard/hp/folio_9470m/Makefile.inc
@@ -17,3 +17,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/folio_9470m/romstage.c b/src/mainboard/hp/folio_9470m/early_init.c
index 07ee1eb283..e5a1892023 100644
--- a/src/mainboard/hp/folio_9470m/romstage.c
+++ b/src/mainboard/hp/folio_9470m/early_init.c
@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
@@ -38,7 +39,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 0, 0, 6 }, /* B1P6 */
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
kbc1126_enter_conf();
kbc1126_mailbox_init();
diff --git a/src/mainboard/hp/revolve_810_g1/Makefile.inc b/src/mainboard/hp/revolve_810_g1/Makefile.inc
index 574f56e107..0a15c42fdd 100644
--- a/src/mainboard/hp/revolve_810_g1/Makefile.inc
+++ b/src/mainboard/hp/revolve_810_g1/Makefile.inc
@@ -20,3 +20,5 @@ ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
# FIXME: Other varients with same size onboard ram may exist.
SPD_SOURCES = hynix_4g
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/revolve_810_g1/romstage.c b/src/mainboard/hp/revolve_810_g1/early_init.c
index 24247420ab..b464ce3daa 100644
--- a/src/mainboard/hp/revolve_810_g1/romstage.c
+++ b/src/mainboard/hp/revolve_810_g1/early_init.c
@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <string.h>
#include <cbfs.h>
#include <console/console.h>
@@ -46,7 +47,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 0, 0, 6 }, /* B1P6 */
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
kbc1126_enter_conf();
kbc1126_mailbox_init();
diff --git a/src/mainboard/hp/z220_sff_workstation/Makefile.inc b/src/mainboard/hp/z220_sff_workstation/Makefile.inc
index af2b6742f0..f0b34f9840 100644
--- a/src/mainboard/hp/z220_sff_workstation/Makefile.inc
+++ b/src/mainboard/hp/z220_sff_workstation/Makefile.inc
@@ -1,3 +1,5 @@
bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/hp/z220_sff_workstation/romstage.c b/src/mainboard/hp/z220_sff_workstation/early_init.c
index 0b9ffe4d56..fd70690079 100644
--- a/src/mainboard/hp/z220_sff_workstation/romstage.c
+++ b/src/mainboard/hp/z220_sff_workstation/early_init.c
@@ -16,6 +16,7 @@
* GNU General Public License for more details.
*/
+#include <bootblock_common.h>
#include <stdint.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
@@ -44,7 +45,7 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, 7 },
};
-void mainboard_config_superio(void)
+void bootblock_mainboard_early_init(void)
{
if (CONFIG(CONSOLE_SERIAL))
nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);