From a90ec66c0a6fd4b03ed33274965daa0986666bb5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 13 Oct 2020 12:29:53 -0600 Subject: [PATCH] Fix compilation Change-Id: Ie6e0bf1d4ad7829d0d76c716d241ac5c15e9c331 --- src/mainboard/system76/galp5/Kconfig | 2 +- src/mainboard/system76/galp5/Makefile.inc | 2 +- src/mainboard/system76/galp5/mainboard.c | 11 +++++++++++ src/mainboard/system76/galp5/ramstage.c | 10 ---------- 4 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 src/mainboard/system76/galp5/mainboard.c delete mode 100644 src/mainboard/system76/galp5/ramstage.c diff --git a/src/mainboard/system76/galp5/Kconfig b/src/mainboard/system76/galp5/Kconfig index 46e59a35be..c07012156f 100644 --- a/src/mainboard/system76/galp5/Kconfig +++ b/src/mainboard/system76/galp5/Kconfig @@ -65,7 +65,7 @@ config MAX_CPUS config DIMM_MAX int - default 2 + default 4 # Hack to make soc code work config DIMM_SPD_SIZE int diff --git a/src/mainboard/system76/galp5/Makefile.inc b/src/mainboard/system76/galp5/Makefile.inc index c15a0141f1..96f1f8aa03 100644 --- a/src/mainboard/system76/galp5/Makefile.inc +++ b/src/mainboard/system76/galp5/Makefile.inc @@ -1,3 +1,3 @@ bootblock-y += bootblock.c -ramstage-y += ramstage.c +ramstage-y += mainboard.c ramstage-y += hda_verb.c diff --git a/src/mainboard/system76/galp5/mainboard.c b/src/mainboard/system76/galp5/mainboard.c new file mode 100644 index 0000000000..61c3ed06b1 --- /dev/null +++ b/src/mainboard/system76/galp5/mainboard.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include "gpio.h" + +static void mainboard_init(void *chip_info) { + gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); +} + +struct chip_operations mainboard_ops = { + .init = mainboard_init, +}; diff --git a/src/mainboard/system76/galp5/ramstage.c b/src/mainboard/system76/galp5/ramstage.c deleted file mode 100644 index f4b1839a4b..0000000000 --- a/src/mainboard/system76/galp5/ramstage.c +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include "gpio.h" - -void mainboard_silicon_init_params(FSP_S_CONFIG *params) { - /* Configure pads prior to SiliconInit() in case there's any - * dependencies during hardware initialization. */ - cnl_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); -}