From f84e304ea1e22228872c092bf2292d5e3078db24 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 22 Nov 2020 16:43:09 +0000 Subject: mb/kontron/bsl6: Use include folder for header files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id73a7385f7701920efebaa3e293ac50a6ba93272 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/47849 Reviewed-by: Nico Huber Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- src/mainboard/kontron/bsl6/Makefile.inc | 2 + src/mainboard/kontron/bsl6/gpio.h | 230 --------------------- .../kontron/bsl6/include/mainboard/gpio.h | 230 +++++++++++++++++++++ src/mainboard/kontron/bsl6/include/variant.h | 10 + src/mainboard/kontron/bsl6/ramstage.c | 2 +- src/mainboard/kontron/bsl6/romstage.c | 3 +- src/mainboard/kontron/bsl6/variant.h | 10 - .../kontron/bsl6/variants/boxer26/romstage.c | 3 +- .../kontron/bsl6/variants/bsl6/romstage.c | 3 +- 9 files changed, 246 insertions(+), 247 deletions(-) delete mode 100644 src/mainboard/kontron/bsl6/gpio.h create mode 100644 src/mainboard/kontron/bsl6/include/mainboard/gpio.h create mode 100644 src/mainboard/kontron/bsl6/include/variant.h delete mode 100644 src/mainboard/kontron/bsl6/variant.h (limited to 'src/mainboard/kontron/bsl6') diff --git a/src/mainboard/kontron/bsl6/Makefile.inc b/src/mainboard/kontron/bsl6/Makefile.inc index 1e12ee479b..49c9a6c570 100644 --- a/src/mainboard/kontron/bsl6/Makefile.inc +++ b/src/mainboard/kontron/bsl6/Makefile.inc @@ -1,5 +1,7 @@ ## SPDX-License-Identifier: GPL-2.0-only +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include + bootblock-y += bootblock.c romstage-y += variants/$(VARIANT_DIR)/romstage.c diff --git a/src/mainboard/kontron/bsl6/gpio.h b/src/mainboard/kontron/bsl6/gpio.h deleted file mode 100644 index d6e976ee10..0000000000 --- a/src/mainboard/kontron/bsl6/gpio.h +++ /dev/null @@ -1,230 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef MAINBOARD_GPIO_H -#define MAINBOARD_GPIO_H - -#include -#include - -#ifndef __ACPI__ - -/* Pad configuration in ramstage. */ -static const struct pad_config gpio_table[] = { - PAD_CFG_NF(GPP_A0, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_A1, UP_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_A2, UP_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_A3, UP_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_A4, UP_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_A5, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_A6, NONE, PLTRST, NF1), - PAD_CFG_GPI_INT(GPP_A7, NONE, PLTRST, OFF), - PAD_CFG_NF(GPP_A8, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_A9, DN_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_A10, DN_20K, PLTRST, NF1), - PAD_CFG_GPI_INT(GPP_A11, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_A12, 1, PLTRST), - PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_A15, UP_20K, DEEP, NF1), - PAD_CFG_GPI_INT(GPP_A16, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_A17, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_A18, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_A19, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_A20, 1, DEEP), - PAD_CFG_GPO(GPP_A21, 1, DEEP), - PAD_CFG_GPO(GPP_A22, 1, DEEP), - PAD_CFG_GPI_INT(GPP_A23, NONE, PLTRST, OFF), - - PAD_CFG_GPI_INT(GPP_B0, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B1, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B2, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_B3, 1, DEEP), - PAD_CFG_NF(GPP_B4, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1), - PAD_CFG_GPO(GPP_B6, 1, DEEP), - PAD_CFG_GPO(GPP_B7, 1, DEEP), - PAD_CFG_GPO(GPP_B8, 1, DEEP), - PAD_CFG_GPO(GPP_B9, 1, DEEP), - PAD_CFG_GPO(GPP_B10, 1, DEEP), - PAD_CFG_GPI_INT(GPP_B11, NONE, PLTRST, OFF), - PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_B14, DN_20K, PLTRST, NF1), - PAD_CFG_GPI_INT(GPP_B15, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B16, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_B17, 1, DEEP), - PAD_CFG_GPI_INT(GPP_B18, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B19, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B20, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B21, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_B22, NONE, PLTRST, OFF), - PAD_CFG_TERM_GPO(GPP_B23, 1, UP_20K, DEEP), - - PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), - PAD_CFG_GPI_SCI(GPP_C2, NONE, DEEP, EDGE_SINGLE, INVERT), - PAD_CFG_NF(GPP_C3, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_C4, NONE, DEEP, NF1), - PAD_CFG_GPI_INT(GPP_C5, NONE, PLTRST, OFF), - /* XXX: C6 not readable */ - /* XXX: C7 not readable */ - PAD_CFG_NF(GPP_C8, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C9, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C10, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C11, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C12, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C13, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C14, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C15, NONE, PLTRST, NF1), - PAD_CFG_GPI_INT(GPP_C16, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_C17, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_C18, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_C19, NONE, PLTRST, OFF), - PAD_CFG_NF(GPP_C20, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C21, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C22, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_C23, NONE, PLTRST, NF1), - - PAD_CFG_GPO(GPP_D0, 1, DEEP), - PAD_CFG_GPI_INT(GPP_D1, NONE, DEEP, OFF), - PAD_CFG_GPI_INT(GPP_D2, NONE, DEEP, OFF), - PAD_CFG_GPO(GPP_D3, 1, DEEP), - PAD_CFG_GPI_INT(GPP_D4, NONE, PLTRST, OFF), - PAD_CFG_NF(GPP_D5, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_D6, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_D7, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_D8, NONE, PLTRST, NF1), - PAD_CFG_GPO(GPP_D9, 0, DEEP), - PAD_CFG_GPO(GPP_D10, 0, DEEP), - PAD_CFG_GPI_SCI_HIGH(GPP_D11, NONE, DEEP, LEVEL), - PAD_CFG_GPI_SCI_HIGH(GPP_D12, NONE, DEEP, LEVEL), - PAD_CFG_GPI_INT(GPP_D13, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_D14, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_D15, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_D16, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_D17, 0, DEEP), - PAD_CFG_GPI_INT(GPP_D18, NONE, DEEP, OFF), - PAD_CFG_GPO(GPP_D19, 0, DEEP), - PAD_CFG_GPO(GPP_D20, 0, DEEP), - PAD_CFG_GPO(GPP_D21, 1, DEEP), - PAD_CFG_GPO(GPP_D22, 0, DEEP), - PAD_CFG_GPI_INT(GPP_D23, NONE, PLTRST, OFF), - - PAD_CFG_NF(GPP_E0, UP_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_E1, UP_20K, PLTRST, NF1), - PAD_CFG_GPI_INT(GPP_E2, NONE, PLTRST, OFF), - PAD_CFG_GPI_SCI_HIGH(GPP_E3, NONE, DEEP, LEVEL), - PAD_CFG_NF(GPP_E4, NONE, PWROK, NF1), - PAD_CFG_GPI_INT(GPP_E5, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_E6, NONE, PLTRST, OFF), - PAD_CFG_GPI_SCI(GPP_E7, NONE, DEEP, EDGE_SINGLE, INVERT), - PAD_CFG_NF(GPP_E8, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_E11, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1), - - PAD_CFG_GPI_INT(GPP_F0, NONE, PLTRST, OFF), - PAD_CFG_NF(GPP_F1, UP_20K, PLTRST, NF1), - PAD_CFG_NF(GPP_F2, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_F3, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_F4, NONE, PLTRST, NF1), - PAD_CFG_GPI_SCI(GPP_F5, NONE, DEEP, EDGE_SINGLE, NONE), - PAD_CFG_NF(GPP_F6, NONE, PWROK, NF1), - PAD_CFG_GPI_INT(GPP_F7, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_F8, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_F9, NONE, PLTRST, OFF), - PAD_CFG_GPI_APIC_HIGH(GPP_F10, NONE, PLTRST), - PAD_CFG_GPI_INT(GPP_F11, NONE, PLTRST, OFF), - PAD_CFG_GPI_APIC_LOW(GPP_F12, NONE, PLTRST), - PAD_CFG_GPI_APIC_HIGH(GPP_F13, NONE, PLTRST), - PAD_CFG_GPI_APIC_LOW(GPP_F14, NONE, DEEP), - PAD_CFG_NF(GPP_F15, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_F16, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_F17, NONE, DEEP, NF1), - PAD_CFG_GPO(GPP_F18, 1, PLTRST), - PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1), - PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1), - PAD_CFG_GPO(GPP_F22, 1, PLTRST), - PAD_CFG_GPO(GPP_F23, 1, DEEP), - - PAD_CFG_GPO(GPP_G0, 1, PLTRST), - PAD_CFG_GPO(GPP_G1, 1, PLTRST), - PAD_CFG_GPI_SCI_LOW(GPP_G2, NONE, PLTRST, LEVEL), - PAD_CFG_GPI_SCI_LOW(GPP_G3, NONE, PLTRST, LEVEL), - PAD_CFG_GPO(GPP_G4, 1, DEEP), - PAD_CFG_GPI_APIC_HIGH(GPP_G5, NONE, PLTRST), - PAD_CFG_GPI_SCI(GPP_G6, NONE, PLTRST, EDGE_SINGLE, INVERT), - PAD_CFG_GPO(GPP_G7, 1, DEEP), - PAD_CFG_GPI_INT(GPP_G8, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_G9, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_G10, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_G11, NONE, PLTRST, OFF), - PAD_CFG_GPI_SCI(GPP_G12, DN_20K, PLTRST, EDGE_SINGLE, INVERT), - PAD_CFG_GPO(GPP_G13, 1, PLTRST), - PAD_CFG_GPI_SCI(GPP_G14, NONE, PLTRST, EDGE_SINGLE, INVERT), - PAD_CFG_GPO(GPP_G15, 0, PLTRST), - PAD_CFG_TERM_GPO(GPP_G16, 1, DN_20K, PLTRST), - PAD_CFG_GPI_INT(GPP_G17, NONE, PLTRST, OFF), - PAD_CFG_GPI_APIC_HIGH(GPP_G18, NONE, PLTRST), - PAD_CFG_NF(GPP_G19, NONE, PLTRST, NF1), - PAD_CFG_GPI_APIC_HIGH(GPP_G20, NONE, PLTRST), - PAD_CFG_GPI_SCI(GPP_G21, NONE, DEEP, EDGE_SINGLE, INVERT), - PAD_CFG_GPO(GPP_G22, 1, PLTRST), - PAD_CFG_GPO(GPP_G23, 1, PLTRST), - - PAD_CFG_GPO(GPP_H0, 1, DEEP), - PAD_CFG_GPO(GPP_H1, 1, DEEP), - PAD_CFG_GPO(GPP_H2, 1, DEEP), - PAD_CFG_GPO(GPP_H3, 1, DEEP), - PAD_CFG_GPO(GPP_H4, 1, DEEP), - PAD_CFG_GPO(GPP_H5, 1, DEEP), - PAD_CFG_GPO(GPP_H6, 1, DEEP), - PAD_CFG_GPO(GPP_H7, 1, DEEP), - PAD_CFG_GPO(GPP_H8, 1, DEEP), - PAD_CFG_GPO(GPP_H9, 1, DEEP), - PAD_CFG_GPI_INT(GPP_H10, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_H11, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_H12, NONE, PLTRST, OFF), - PAD_CFG_GPI_APIC_HIGH(GPP_H13, NONE, PLTRST), - PAD_CFG_GPI_APIC_HIGH(GPP_H14, NONE, PLTRST), - PAD_CFG_GPI_APIC_HIGH(GPP_H15, NONE, PLTRST), - PAD_CFG_GPI_INT(GPP_H16, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_H17, 1, PLTRST), - PAD_CFG_GPI_INT(GPP_H18, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_H19, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_H20, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_H21, NONE, PLTRST, OFF), - PAD_CFG_GPI_INT(GPP_H22, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPP_H23, 0, DEEP), - - PAD_CFG_GPI_INT(GPD0, NONE, PLTRST, OFF), - PAD_CFG_GPO(GPD1, 0, PWROK), - PAD_CFG_NF(GPD2, NONE, PWROK, NF1), - PAD_CFG_NF(GPD3, UP_20K, PWROK, NF1), - PAD_CFG_NF(GPD4, NONE, PWROK, NF1), - PAD_CFG_NF(GPD5, NONE, PWROK, NF1), - PAD_CFG_NF(GPD6, NONE, PWROK, NF1), - PAD_CFG_GPO(GPD7, 1, PWROK), - PAD_CFG_NF(GPD8, NONE, PWROK, NF1), - PAD_CFG_GPO(GPD9, 0, PWROK), - PAD_CFG_NF(GPD10, NONE, PWROK, NF1), - PAD_CFG_NF(GPD11, NONE, PWROK, NF1), - - PAD_CFG_NF(GPP_I0, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I1, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I2, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I3, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I4, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I5, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I6, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I7, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I8, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I9, NONE, PLTRST, NF1), - PAD_CFG_NF(GPP_I10, NONE, PLTRST, NF1), -}; - -#endif - -#endif diff --git a/src/mainboard/kontron/bsl6/include/mainboard/gpio.h b/src/mainboard/kontron/bsl6/include/mainboard/gpio.h new file mode 100644 index 0000000000..d6e976ee10 --- /dev/null +++ b/src/mainboard/kontron/bsl6/include/mainboard/gpio.h @@ -0,0 +1,230 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef MAINBOARD_GPIO_H +#define MAINBOARD_GPIO_H + +#include +#include + +#ifndef __ACPI__ + +/* Pad configuration in ramstage. */ +static const struct pad_config gpio_table[] = { + PAD_CFG_NF(GPP_A0, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_A1, UP_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_A2, UP_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_A3, UP_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_A4, UP_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_A5, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_A6, NONE, PLTRST, NF1), + PAD_CFG_GPI_INT(GPP_A7, NONE, PLTRST, OFF), + PAD_CFG_NF(GPP_A8, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_A9, DN_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_A10, DN_20K, PLTRST, NF1), + PAD_CFG_GPI_INT(GPP_A11, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_A12, 1, PLTRST), + PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_A15, UP_20K, DEEP, NF1), + PAD_CFG_GPI_INT(GPP_A16, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_A17, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_A18, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_A19, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_A20, 1, DEEP), + PAD_CFG_GPO(GPP_A21, 1, DEEP), + PAD_CFG_GPO(GPP_A22, 1, DEEP), + PAD_CFG_GPI_INT(GPP_A23, NONE, PLTRST, OFF), + + PAD_CFG_GPI_INT(GPP_B0, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B1, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B2, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_B3, 1, DEEP), + PAD_CFG_NF(GPP_B4, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1), + PAD_CFG_GPO(GPP_B6, 1, DEEP), + PAD_CFG_GPO(GPP_B7, 1, DEEP), + PAD_CFG_GPO(GPP_B8, 1, DEEP), + PAD_CFG_GPO(GPP_B9, 1, DEEP), + PAD_CFG_GPO(GPP_B10, 1, DEEP), + PAD_CFG_GPI_INT(GPP_B11, NONE, PLTRST, OFF), + PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_B14, DN_20K, PLTRST, NF1), + PAD_CFG_GPI_INT(GPP_B15, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B16, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_B17, 1, DEEP), + PAD_CFG_GPI_INT(GPP_B18, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B19, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B20, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B21, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_B22, NONE, PLTRST, OFF), + PAD_CFG_TERM_GPO(GPP_B23, 1, UP_20K, DEEP), + + PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), + PAD_CFG_GPI_SCI(GPP_C2, NONE, DEEP, EDGE_SINGLE, INVERT), + PAD_CFG_NF(GPP_C3, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_C4, NONE, DEEP, NF1), + PAD_CFG_GPI_INT(GPP_C5, NONE, PLTRST, OFF), + /* XXX: C6 not readable */ + /* XXX: C7 not readable */ + PAD_CFG_NF(GPP_C8, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C9, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C10, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C11, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C12, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C13, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C14, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C15, NONE, PLTRST, NF1), + PAD_CFG_GPI_INT(GPP_C16, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_C17, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_C18, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_C19, NONE, PLTRST, OFF), + PAD_CFG_NF(GPP_C20, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C21, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C22, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_C23, NONE, PLTRST, NF1), + + PAD_CFG_GPO(GPP_D0, 1, DEEP), + PAD_CFG_GPI_INT(GPP_D1, NONE, DEEP, OFF), + PAD_CFG_GPI_INT(GPP_D2, NONE, DEEP, OFF), + PAD_CFG_GPO(GPP_D3, 1, DEEP), + PAD_CFG_GPI_INT(GPP_D4, NONE, PLTRST, OFF), + PAD_CFG_NF(GPP_D5, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_D6, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_D7, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_D8, NONE, PLTRST, NF1), + PAD_CFG_GPO(GPP_D9, 0, DEEP), + PAD_CFG_GPO(GPP_D10, 0, DEEP), + PAD_CFG_GPI_SCI_HIGH(GPP_D11, NONE, DEEP, LEVEL), + PAD_CFG_GPI_SCI_HIGH(GPP_D12, NONE, DEEP, LEVEL), + PAD_CFG_GPI_INT(GPP_D13, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_D14, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_D15, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_D16, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_D17, 0, DEEP), + PAD_CFG_GPI_INT(GPP_D18, NONE, DEEP, OFF), + PAD_CFG_GPO(GPP_D19, 0, DEEP), + PAD_CFG_GPO(GPP_D20, 0, DEEP), + PAD_CFG_GPO(GPP_D21, 1, DEEP), + PAD_CFG_GPO(GPP_D22, 0, DEEP), + PAD_CFG_GPI_INT(GPP_D23, NONE, PLTRST, OFF), + + PAD_CFG_NF(GPP_E0, UP_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_E1, UP_20K, PLTRST, NF1), + PAD_CFG_GPI_INT(GPP_E2, NONE, PLTRST, OFF), + PAD_CFG_GPI_SCI_HIGH(GPP_E3, NONE, DEEP, LEVEL), + PAD_CFG_NF(GPP_E4, NONE, PWROK, NF1), + PAD_CFG_GPI_INT(GPP_E5, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_E6, NONE, PLTRST, OFF), + PAD_CFG_GPI_SCI(GPP_E7, NONE, DEEP, EDGE_SINGLE, INVERT), + PAD_CFG_NF(GPP_E8, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_E11, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1), + + PAD_CFG_GPI_INT(GPP_F0, NONE, PLTRST, OFF), + PAD_CFG_NF(GPP_F1, UP_20K, PLTRST, NF1), + PAD_CFG_NF(GPP_F2, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_F3, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_F4, NONE, PLTRST, NF1), + PAD_CFG_GPI_SCI(GPP_F5, NONE, DEEP, EDGE_SINGLE, NONE), + PAD_CFG_NF(GPP_F6, NONE, PWROK, NF1), + PAD_CFG_GPI_INT(GPP_F7, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_F8, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_F9, NONE, PLTRST, OFF), + PAD_CFG_GPI_APIC_HIGH(GPP_F10, NONE, PLTRST), + PAD_CFG_GPI_INT(GPP_F11, NONE, PLTRST, OFF), + PAD_CFG_GPI_APIC_LOW(GPP_F12, NONE, PLTRST), + PAD_CFG_GPI_APIC_HIGH(GPP_F13, NONE, PLTRST), + PAD_CFG_GPI_APIC_LOW(GPP_F14, NONE, DEEP), + PAD_CFG_NF(GPP_F15, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_F16, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_F17, NONE, DEEP, NF1), + PAD_CFG_GPO(GPP_F18, 1, PLTRST), + PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1), + PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1), + PAD_CFG_GPO(GPP_F22, 1, PLTRST), + PAD_CFG_GPO(GPP_F23, 1, DEEP), + + PAD_CFG_GPO(GPP_G0, 1, PLTRST), + PAD_CFG_GPO(GPP_G1, 1, PLTRST), + PAD_CFG_GPI_SCI_LOW(GPP_G2, NONE, PLTRST, LEVEL), + PAD_CFG_GPI_SCI_LOW(GPP_G3, NONE, PLTRST, LEVEL), + PAD_CFG_GPO(GPP_G4, 1, DEEP), + PAD_CFG_GPI_APIC_HIGH(GPP_G5, NONE, PLTRST), + PAD_CFG_GPI_SCI(GPP_G6, NONE, PLTRST, EDGE_SINGLE, INVERT), + PAD_CFG_GPO(GPP_G7, 1, DEEP), + PAD_CFG_GPI_INT(GPP_G8, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_G9, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_G10, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_G11, NONE, PLTRST, OFF), + PAD_CFG_GPI_SCI(GPP_G12, DN_20K, PLTRST, EDGE_SINGLE, INVERT), + PAD_CFG_GPO(GPP_G13, 1, PLTRST), + PAD_CFG_GPI_SCI(GPP_G14, NONE, PLTRST, EDGE_SINGLE, INVERT), + PAD_CFG_GPO(GPP_G15, 0, PLTRST), + PAD_CFG_TERM_GPO(GPP_G16, 1, DN_20K, PLTRST), + PAD_CFG_GPI_INT(GPP_G17, NONE, PLTRST, OFF), + PAD_CFG_GPI_APIC_HIGH(GPP_G18, NONE, PLTRST), + PAD_CFG_NF(GPP_G19, NONE, PLTRST, NF1), + PAD_CFG_GPI_APIC_HIGH(GPP_G20, NONE, PLTRST), + PAD_CFG_GPI_SCI(GPP_G21, NONE, DEEP, EDGE_SINGLE, INVERT), + PAD_CFG_GPO(GPP_G22, 1, PLTRST), + PAD_CFG_GPO(GPP_G23, 1, PLTRST), + + PAD_CFG_GPO(GPP_H0, 1, DEEP), + PAD_CFG_GPO(GPP_H1, 1, DEEP), + PAD_CFG_GPO(GPP_H2, 1, DEEP), + PAD_CFG_GPO(GPP_H3, 1, DEEP), + PAD_CFG_GPO(GPP_H4, 1, DEEP), + PAD_CFG_GPO(GPP_H5, 1, DEEP), + PAD_CFG_GPO(GPP_H6, 1, DEEP), + PAD_CFG_GPO(GPP_H7, 1, DEEP), + PAD_CFG_GPO(GPP_H8, 1, DEEP), + PAD_CFG_GPO(GPP_H9, 1, DEEP), + PAD_CFG_GPI_INT(GPP_H10, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_H11, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_H12, NONE, PLTRST, OFF), + PAD_CFG_GPI_APIC_HIGH(GPP_H13, NONE, PLTRST), + PAD_CFG_GPI_APIC_HIGH(GPP_H14, NONE, PLTRST), + PAD_CFG_GPI_APIC_HIGH(GPP_H15, NONE, PLTRST), + PAD_CFG_GPI_INT(GPP_H16, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_H17, 1, PLTRST), + PAD_CFG_GPI_INT(GPP_H18, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_H19, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_H20, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_H21, NONE, PLTRST, OFF), + PAD_CFG_GPI_INT(GPP_H22, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPP_H23, 0, DEEP), + + PAD_CFG_GPI_INT(GPD0, NONE, PLTRST, OFF), + PAD_CFG_GPO(GPD1, 0, PWROK), + PAD_CFG_NF(GPD2, NONE, PWROK, NF1), + PAD_CFG_NF(GPD3, UP_20K, PWROK, NF1), + PAD_CFG_NF(GPD4, NONE, PWROK, NF1), + PAD_CFG_NF(GPD5, NONE, PWROK, NF1), + PAD_CFG_NF(GPD6, NONE, PWROK, NF1), + PAD_CFG_GPO(GPD7, 1, PWROK), + PAD_CFG_NF(GPD8, NONE, PWROK, NF1), + PAD_CFG_GPO(GPD9, 0, PWROK), + PAD_CFG_NF(GPD10, NONE, PWROK, NF1), + PAD_CFG_NF(GPD11, NONE, PWROK, NF1), + + PAD_CFG_NF(GPP_I0, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I1, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I2, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I3, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I4, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I5, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I6, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I7, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I8, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I9, NONE, PLTRST, NF1), + PAD_CFG_NF(GPP_I10, NONE, PLTRST, NF1), +}; + +#endif + +#endif diff --git a/src/mainboard/kontron/bsl6/include/variant.h b/src/mainboard/kontron/bsl6/include/variant.h new file mode 100644 index 0000000000..4f65da5fb1 --- /dev/null +++ b/src/mainboard/kontron/bsl6/include/variant.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef VARIANT_H +#define VARIANT_H + +#include + +void variant_memory_init_params(FSPM_UPD *); + +#endif diff --git a/src/mainboard/kontron/bsl6/ramstage.c b/src/mainboard/kontron/bsl6/ramstage.c index 2664a4ff82..b26c62fc85 100644 --- a/src/mainboard/kontron/bsl6/ramstage.c +++ b/src/mainboard/kontron/bsl6/ramstage.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include "gpio.h" +#include void mainboard_silicon_init_params(FSP_SIL_UPD *params) { diff --git a/src/mainboard/kontron/bsl6/romstage.c b/src/mainboard/kontron/bsl6/romstage.c index 9d9169c0d2..0cb7b06375 100644 --- a/src/mainboard/kontron/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/romstage.c @@ -8,8 +8,7 @@ #include #include #include - -#include "variant.h" +#include /* Rcomp resistor */ static const u16 rcomp_resistors[3] = { 121, 75, 100 }; diff --git a/src/mainboard/kontron/bsl6/variant.h b/src/mainboard/kontron/bsl6/variant.h deleted file mode 100644 index 4f65da5fb1..0000000000 --- a/src/mainboard/kontron/bsl6/variant.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef VARIANT_H -#define VARIANT_H - -#include - -void variant_memory_init_params(FSPM_UPD *); - -#endif diff --git a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c index 9c14d84ea7..f1409e0b42 100644 --- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c @@ -5,8 +5,7 @@ #include #include #include - -#include "../../variant.h" +#include void variant_memory_init_params(FSPM_UPD *const mupd) { diff --git a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c index 8b32bf5bf6..c9122c1c24 100644 --- a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include - -#include "../../variant.h" +#include void variant_memory_init_params(FSPM_UPD *const mupd) { -- cgit v1.2.3