12 files changed, 2 insertions, 140 deletions
diff --git a/src/mainboard/dell/snb_ivb_latitude/Makefile.mk b/src/mainboard/dell/snb_ivb_latitude/Makefile.mk
index 299fbb9bad..bd50ae7717 100644
--- a/src/mainboard/dell/snb_ivb_latitude/Makefile.mk
+++ b/src/mainboard/dell/snb_ivb_latitude/Makefile.mk
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-bootblock-y += variants/$(VARIANT_DIR)/early_init.c
+bootblock-y += early_init.c
 bootblock-y += variants/$(VARIANT_DIR)/gpio.c
 
-romstage-y += variants/$(VARIANT_DIR)/early_init.c
+romstage-y += early_init.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e5420/early_init.c b/src/mainboard/dell/snb_ivb_latitude/early_init.c
index ff83db095b..ff83db095b 100644
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e5420/early_init.c
+++ b/src/mainboard/dell/snb_ivb_latitude/early_init.c
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e5520/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e5520/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e5520/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e5530/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e5530/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e5530/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6220/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6220/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6220/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6230/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6230/early_init.c
deleted file mode 100644
index 24c1b32467..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6230/early_init.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN | KBC_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6320/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6320/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6320/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6330/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6330/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6330/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6420/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6420/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6420/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6430/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6430/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6430/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6520/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6520/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6520/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6530/early_init.c b/src/mainboard/dell/snb_ivb_latitude/variants/e6530/early_init.c
deleted file mode 100644
index ff83db095b..0000000000
--- a/src/mainboard/dell/snb_ivb_latitude/variants/e6530/early_init.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <bootblock_common.h>
-#include <device/pci_ops.h>
-#include <ec/dell/mec5035/mec5035.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-
-void bootblock_mainboard_early_init(void)
-{
-	pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN
-			| KBC_LPC_EN | FDD_LPC_EN | LPT_LPC_EN
-			| COMB_LPC_EN | COMA_LPC_EN);
-	mec5035_early_init();
-}