From 1b0d75177724ae00df399ffca36fd716b294063f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Tue, 24 Nov 2020 13:57:48 +0100 Subject: [PATCH] mb/supermicro/x11-lga1151-series: configure gpios in mainboard init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- .../supermicro/x11-lga1151-series/Makefile.inc | 2 +- .../supermicro/x11-lga1151-series/mainboard.c | 4 +++- .../supermicro/x11-lga1151-series/ramstage.c | 11 ----------- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 src/mainboard/supermicro/x11-lga1151-series/ramstage.c diff --git a/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc b/src/mainboard/supermicro/x11-lga1151-series/Makefile.inc index d64fcb35ec..f9b4e9890b 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 0380c9848c..92718e8c0d 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/mainboard.c +++ b/src/mainboard/supermicro/x11-lga1151-series/mainboard.c @@ -2,6 +2,8 @@ #include #include +#include +#include __weak void variant_mainboard_init(struct device *dev) { @@ -10,7 +12,7 @@ __weak void variant_mainboard_init(struct device *dev) 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 9262e2ec1d..0000000000 --- a/src/mainboard/supermicro/x11-lga1151-series/ramstage.c +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -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)); -}