3 files changed, 2 insertions, 11 deletions
diff --git a/src/mainboard/purism/librem_bdw/Makefile.inc b/src/mainboard/purism/librem_bdw/Makefile.inc
index 293e186cec..16ce37a95f 100644
--- a/src/mainboard/purism/librem_bdw/Makefile.inc
+++ b/src/mainboard/purism/librem_bdw/Makefile.inc
@@ -13,5 +13,6 @@
 ## GNU General Public License for more details.
 ##
 
+romstage-y += gpio.c
 romstage-y += variants/$(VARIANT_DIR)/pei_data.c
 ramstage-y += variants/$(VARIANT_DIR)/pei_data.c
diff --git a/src/mainboard/purism/librem_bdw/gpio.h b/src/mainboard/purism/librem_bdw/gpio.c
index 98b09bc45a..510299659e 100644
--- a/src/mainboard/purism/librem_bdw/gpio.h
+++ b/src/mainboard/purism/librem_bdw/gpio.c
@@ -13,12 +13,9 @@
  * GNU General Public License for more details.
  */
 
-#ifndef MAINBOARD_GPIO_H
-#define MAINBOARD_GPIO_H
-
 #include <soc/gpio.h>
 
-static const struct gpio_config mainboard_gpio_config[] = {
+const struct gpio_config mainboard_gpio_config[] = {
 	PCH_GPIO_INPUT,		/* 0 */
 	PCH_GPIO_INPUT,		/* 1 */
 	PCH_GPIO_INPUT,		/* 2 */
@@ -116,5 +113,3 @@ static const struct gpio_config mainboard_gpio_config[] = {
 	PCH_GPIO_INPUT,		/* 94 */
 	PCH_GPIO_END
 };
-
-#endif
diff --git a/src/mainboard/purism/librem_bdw/romstage.c b/src/mainboard/purism/librem_bdw/romstage.c
index 2e0ae85b95..6591229621 100644
--- a/src/mainboard/purism/librem_bdw/romstage.c
+++ b/src/mainboard/purism/librem_bdw/romstage.c
@@ -14,19 +14,14 @@
  */
 
 #include <string.h>
-#include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
 #include <soc/romstage.h>
-#include "gpio.h"
 
 void mainboard_romstage_entry(struct romstage_params *rp)
 {
 	struct pei_data pei_data;
 
-	/* Initialize GPIOs */
-	init_gpios(mainboard_gpio_config);
-
 	/* Fill out PEI DATA */
 	memset(&pei_data, 0, sizeof(pei_data));
 	mainboard_fill_pei_data(&pei_data);