Change in coreboot[master]: mb/supermicro/x11-lga1151-series: configure gpios in mainboard init

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48086 )

Change subject: mb/supermicro/x11-lga1151-series: configure gpios in mainboard init
......................................................................

mb/supermicro/x11-lga1151-series: configure gpios in mainboard init

Move gpio configuration from the Fsp callback to mainboard init.

Tested successfully on X11SSM-F.

Signed-off-by: Michael Niewöhner 
Change-Id: If2a54c75c5243d94cdc025c597ee347820b35d32
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48086
Reviewed-by:  Felix Singer 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
M src/mainboard/supermicro/x11-lga1151-series/mainboard.c
D src/mainboard/supermicro/x11-lga1151-series/ramstage.c
3 files changed, 4 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
   Felix Singer: Looks good to me, approved

diff --git a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
index d64fcb3..f9b4e98 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
+++ b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc
@@ -2,7 +2,7 @@

bootblock-y += bootblock.c

-ramstage-y += ramstage.c
+ramstage-y += mainboard.c

CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include

diff --git a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c
index 0380c98..92718e8 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c
+++ b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c
@@ -2,6 +2,8 @@

#include <mainboard.h>
 #include <device/device.h>
+#include <soc/ramstage.h>
+#include <variant/gpio.h>

__weak void variant_mainboard_init(struct device *dev)
 {
@@ -10,7 +12,7 @@
 static void mainboard_init(struct device *dev)
 {
    /* do common init */
-	// placeholder for common mainboard initialization
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));

/* do variant init */
    variant_mainboard_init(dev);
diff --git a/src/mainboard/supermicro/x11-lga1151-series/ramstage.c b/src/mainboard/supermicro/x11-lga1151-series/ramstage.c
deleted file mode 100644
index 9262e2e..0000000
--- a/src/mainboard/supermicro/x11-lga1151-series/ramstage.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <soc/ramstage.h>
-#include <variant/gpio.h>
-
-void mainboard_silicon_init_params(FSP_SIL_UPD *params)
-{
-	/* Configure pads prior to SiliconInit() in case there's any
-	   dependencies during hardware initialization. */
-	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
-}