From 1a0071c7115819302c7df3fa2c07b1ca971e515d Mon Sep 17 00:00:00 2001 From: Michael Niewöhner Date: Sat, 12 Dec 2020 01:51:41 +0100 Subject: mb/clevo/cml-u: drop duplicated configuration of UART pads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit UART pads already get configured in bootblock by the UART driver in soc code. Thus, drop the duplicated code from the mainboard. Tested successfully on Clevo L141CU. Change-Id: I05a459b0af79c75c31b1bb26ea1a1a40857ef9bf Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/48593 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- src/mainboard/clevo/cml-u/Makefile.inc | 3 --- src/mainboard/clevo/cml-u/bootblock.c | 10 ---------- src/mainboard/clevo/cml-u/include/variant/gpio.h | 1 - src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c | 17 ----------------- 4 files changed, 31 deletions(-) delete mode 100644 src/mainboard/clevo/cml-u/bootblock.c delete mode 100644 src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c (limited to 'src/mainboard') diff --git a/src/mainboard/clevo/cml-u/Makefile.inc b/src/mainboard/clevo/cml-u/Makefile.inc index b69c257966..ac150c93d8 100644 --- a/src/mainboard/clevo/cml-u/Makefile.inc +++ b/src/mainboard/clevo/cml-u/Makefile.inc @@ -1,8 +1,5 @@ CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include -bootblock-y += bootblock.c -bootblock-y += variants/$(VARIANT_DIR)/gpio_early.c - ramstage-y += ramstage.c ramstage-y += variants/$(VARIANT_DIR)/gpio.c ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c diff --git a/src/mainboard/clevo/cml-u/bootblock.c b/src/mainboard/clevo/cml-u/bootblock.c deleted file mode 100644 index 389a7a986d..0000000000 --- a/src/mainboard/clevo/cml-u/bootblock.c +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include - -void bootblock_mainboard_init(void) -{ - variant_configure_early_gpios(); -} diff --git a/src/mainboard/clevo/cml-u/include/variant/gpio.h b/src/mainboard/clevo/cml-u/include/variant/gpio.h index 95d576294f..4258325cf9 100644 --- a/src/mainboard/clevo/cml-u/include/variant/gpio.h +++ b/src/mainboard/clevo/cml-u/include/variant/gpio.h @@ -3,7 +3,6 @@ #ifndef VARIANT_GPIO_H #define VARIANT_GPIO_H -void variant_configure_early_gpios(void); void variant_configure_gpios(void); #endif diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c b/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c deleted file mode 100644 index 3ea1c81e99..0000000000 --- a/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -/* Name format: / */ -static const struct pad_config early_gpio_table[] = { - PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), /* UART2_RXD */ - PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* UART2_TXD */ - PAD_NC(GPP_C22, UP_20K), - PAD_NC(GPP_C23, UP_20K), -}; - -void variant_configure_early_gpios(void) -{ - gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table)); -} -- cgit v1.2.3