8 files changed, 8 insertions, 17 deletions
diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc
index fa9a4a9068..18f200647a 100644
--- a/src/mainboard/google/butterfly/Makefile.inc
+++ b/src/mainboard/google/butterfly/Makefile.inc
@@ -23,3 +23,5 @@ romstage-y += gpio.c
 smm-y += mainboard_smi.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/early_init.c
index e1d948d89f..d6566d1b09 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/early_init.c
@@ -112,11 +112,6 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
 	read_spd(&spd[2], 0x52, id_only);
 }
 
-void mainboard_config_superio(void)
-{
-}
-
-
 void mainboard_fill_pei_data(struct pei_data *pei_data)
 {
 	struct pei_data pei_data_template = {
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index 724150c138..22c28c8059 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -42,3 +42,5 @@ spd.bin-file := $(SPD_BIN)
 spd.bin-type := spd
 bootblock-y += gpio.c
 romstage-y += gpio.c
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/early_init.c
index 3fd90e9b17..9d985e622c 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/early_init.c
@@ -201,7 +201,3 @@ int mainboard_should_reset_usb(int s3resume)
 {
 	return !s3resume;
 }
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc
index 67324bdff0..a2ed11e580 100644
--- a/src/mainboard/google/parrot/Makefile.inc
+++ b/src/mainboard/google/parrot/Makefile.inc
@@ -21,3 +21,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/google/parrot/romstage.c b/src/mainboard/google/parrot/early_init.c
index caff3f5436..3c07dc8c54 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/early_init.c
@@ -155,10 +155,6 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
 	read_spd(&spd[2], 0x52, id_only);
 }
 
-void mainboard_config_superio(void)
-{
-}
-
 int mainboard_should_reset_usb(int s3resume)
 {
 	return !s3resume;
diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.inc
index 59ac22dbae..3add36258b 100644
--- a/src/mainboard/google/stout/Makefile.inc
+++ b/src/mainboard/google/stout/Makefile.inc
@@ -26,3 +26,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/google/stout/romstage.c b/src/mainboard/google/stout/early_init.c
index d8e04eaa63..6ee982ad73 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/early_init.c
@@ -198,10 +198,6 @@ int mainboard_should_reset_usb(int s3resume)
 	return !s3resume;
 }
 
-void mainboard_config_superio(void)
-{
-}
-
 const struct southbridge_usb_port mainboard_usb_ports[] = {
 	/* enabled   usb oc pin    length */
 	{1, 0, 0},  /* P0: USB 3.0 1  (OC0) */