mb/supermicro/x11-lga1151-series: rework gpio setup to not use headers

Rework gpio setup for the board series to not use headers but
stage-specific compilation units.

Tested successfully on X11SSM-F.

Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Change-Id: Ic62ce4335af605c081ef288e892441585ff2bd3e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48087
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>

1 files changed, 2 insertions, 11 deletions

diff --git a/src/mainboard/supermicro/x11-lga1151-series/bootblock.c b/src/mainboard/supermicro/x11-lga1151-series/bootblock.c
index 3e5751c3d772..b137c755896f 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/bootblock.c
+++ b/src/mainboard/supermicro/x11-lga1151-series/bootblock.c
@@ -1,20 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <soc/gpio.h>
-#include <variant/gpio.h>
+#include <mainboard/gpio.h>
 #include <superio/aspeed/common/aspeed.h>
 #include <superio/aspeed/ast2400/ast2400.h>
 #include <console/uart.h>
 
-static void early_config_gpio(void)
-{
-	/* This is a hack for FSP because it does things in MemoryInit()
-	 * which it shouldn't do. We have to prepare certain gpios here
-	 * because of the brokenness in FSP. */
-	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
-}
-
 static void early_config_superio(void)
 {
 	const pnp_devfn_t serial_dev = PNP_DEV(0x2e, AST2400_SUART1);
@@ -23,6 +14,6 @@ static void early_config_superio(void)
 
 void bootblock_mainboard_early_init(void)
 {
-	early_config_gpio();
+	mainboard_configure_early_gpios();
 	early_config_superio();
 }