8 files changed, 16 insertions, 96 deletions
diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c
index a6dfe502a2..b6ae4df626 100644
--- a/src/mainboard/supermicro/x6dhe_g/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g/romstage.c
@@ -16,7 +16,6 @@
 #include "debug.c"
 #include "watchdog.c"
 #include "reset.c"
-#include "x6dhe_g_fixups.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "northbridge/intel/e7520/memory_initialized.c"
 #include "cpu/x86/bist.h"
@@ -35,6 +34,10 @@
 	0 )
 #define DEVPRES1_CONFIG (DEVPRES1_D0F1 | DEVPRES1_D8F0)
 
+static void mch_reset(void) {}
+static void mainboard_set_e7520_pll(unsigned bits) {}
+static void mainboard_set_e7520_leds(void) {}
+
 static inline int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
diff --git a/src/mainboard/supermicro/x6dhe_g/x6dhe_g_fixups.c b/src/mainboard/supermicro/x6dhe_g/x6dhe_g_fixups.c
deleted file mode 100644
index cc3e41eb9f..0000000000
--- a/src/mainboard/supermicro/x6dhe_g/x6dhe_g_fixups.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <arch/romcc_io.h>
-
-static void mch_reset(void)
-{
-        return;
-}
-
-
-
-static void mainboard_set_e7520_pll(unsigned bits)
-{
-	return;
-}
-
-
-static void mainboard_set_e7520_leds(void)
-{
-	return;
-}
-
-
-
-
diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c
index fb71fa5f2c..bf2762e8c0 100644
--- a/src/mainboard/supermicro/x6dhe_g2/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c
@@ -14,7 +14,6 @@
 #include "debug.c"
 #include "watchdog.c"
 #include "reset.c"
-#include "x6dhe_g2_fixups.c"
 #include "superio/nsc/pc87427/pc87427_early_init.c"
 #include "northbridge/intel/e7520/memory_initialized.c"
 #include "cpu/x86/bist.h"
@@ -32,6 +31,10 @@
 	0 )
 #define DEVPRES1_CONFIG (DEVPRES1_D0F1 | DEVPRES1_D8F0)
 
+static void mch_reset(void) {}
+static void mainboard_set_e7520_pll(unsigned bits) {}
+static void mainboard_set_e7520_leds(void) {}
+
 static inline int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
diff --git a/src/mainboard/supermicro/x6dhe_g2/x6dhe_g2_fixups.c b/src/mainboard/supermicro/x6dhe_g2/x6dhe_g2_fixups.c
deleted file mode 100644
index cc3e41eb9f..0000000000
--- a/src/mainboard/supermicro/x6dhe_g2/x6dhe_g2_fixups.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <arch/romcc_io.h>
-
-static void mch_reset(void)
-{
-        return;
-}
-
-
-
-static void mainboard_set_e7520_pll(unsigned bits)
-{
-	return;
-}
-
-
-static void mainboard_set_e7520_leds(void)
-{
-	return;
-}
-
-
-
-
diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c
index 19527db918..102ef8ead6 100644
--- a/src/mainboard/supermicro/x6dhr_ig/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c
@@ -14,7 +14,6 @@
 #include "debug.c"
 #include "watchdog.c"
 #include "reset.c"
-#include "x6dhr_fixups.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "northbridge/intel/e7520/memory_initialized.c"
 #include "cpu/x86/bist.h"
@@ -34,6 +33,10 @@
 	0 )
 #define DEVPRES1_CONFIG (DEVPRES1_D0F1 | DEVPRES1_D8F0)
 
+static void mch_reset(void) {}
+static void mainboard_set_e7520_pll(unsigned bits) {}
+static void mainboard_set_e7520_leds(void) {}
+
 static inline int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
diff --git a/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c b/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c
deleted file mode 100644
index cc3e41eb9f..0000000000
--- a/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <arch/romcc_io.h>
-
-static void mch_reset(void)
-{
-        return;
-}
-
-
-
-static void mainboard_set_e7520_pll(unsigned bits)
-{
-	return;
-}
-
-
-static void mainboard_set_e7520_leds(void)
-{
-	return;
-}
-
-
-
-
diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c
index eb54ef5632..44b9ae092d 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c
@@ -14,7 +14,6 @@
 #include "debug.c"
 #include "watchdog.c"
 #include "reset.c"
-#include "x6dhr2_fixups.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "northbridge/intel/e7520/memory_initialized.c"
 #include "cpu/x86/bist.h"
@@ -34,6 +33,10 @@
 	0 )
 #define DEVPRES1_CONFIG (DEVPRES1_D0F1 | DEVPRES1_D8F0)
 
+static void mch_reset(void) {}
+static void mainboard_set_e7520_pll(unsigned bits) {}
+static void mainboard_set_e7520_leds(void) {}
+
 static inline int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
diff --git a/src/mainboard/supermicro/x6dhr_ig2/x6dhr2_fixups.c b/src/mainboard/supermicro/x6dhr_ig2/x6dhr2_fixups.c
deleted file mode 100644
index cc3e41eb9f..0000000000
--- a/src/mainboard/supermicro/x6dhr_ig2/x6dhr2_fixups.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <arch/romcc_io.h>
-
-static void mch_reset(void)
-{
-        return;
-}
-
-
-
-static void mainboard_set_e7520_pll(unsigned bits)
-{
-	return;
-}
-
-
-static void mainboard_set_e7520_leds(void)
-{
-	return;
-}
-
-
-
-