From ce4ecfed577ab4b9e06ad6cd0b30d5d9f536877b Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 21 Nov 2020 13:38:05 +0000 Subject: mb/clevo/cml-u: Move bootblock.c and ramstage.c to mb level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifca49c656f259b08fb8ab47fe36e93c146f25266 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/47834 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/mainboard/clevo/cml-u/Makefile.inc | 4 ++++ src/mainboard/clevo/cml-u/bootblock.c | 10 ++++++++++ src/mainboard/clevo/cml-u/ramstage.c | 11 +++++++++++ src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc | 2 -- src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c | 10 ---------- src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c | 11 ----------- 6 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 src/mainboard/clevo/cml-u/bootblock.c create mode 100644 src/mainboard/clevo/cml-u/ramstage.c delete mode 100644 src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c delete mode 100644 src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c (limited to 'src/mainboard/clevo') diff --git a/src/mainboard/clevo/cml-u/Makefile.inc b/src/mainboard/clevo/cml-u/Makefile.inc index 3af82dd2c9..de3c774c99 100644 --- a/src/mainboard/clevo/cml-u/Makefile.inc +++ b/src/mainboard/clevo/cml-u/Makefile.inc @@ -1,4 +1,8 @@ CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include +bootblock-y += bootblock.c + +ramstage-y += ramstage.c ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c + subdirs-y += variants/$(VARIANT_DIR) diff --git a/src/mainboard/clevo/cml-u/bootblock.c b/src/mainboard/clevo/cml-u/bootblock.c new file mode 100644 index 0000000000..427b02328f --- /dev/null +++ b/src/mainboard/clevo/cml-u/bootblock.c @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +void bootblock_mainboard_init(void) +{ + gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table)); +} diff --git a/src/mainboard/clevo/cml-u/ramstage.c b/src/mainboard/clevo/cml-u/ramstage.c new file mode 100644 index 0000000000..037409cd6a --- /dev/null +++ b/src/mainboard/clevo/cml-u/ramstage.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +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)); +} diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc b/src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc index 57ad0ca19f..0e47d8680f 100644 --- a/src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc +++ b/src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc @@ -1,4 +1,2 @@ -bootblock-y += bootblock.c romstage-y += romstage.c -ramstage-y += ramstage.c SPD_SOURCES = samsung-K4AAG165WA-BCTD diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c b/src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c deleted file mode 100644 index 427b02328f..0000000000 --- a/src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include - -void bootblock_mainboard_init(void) -{ - gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table)); -} diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c b/src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c deleted file mode 100644 index 037409cd6a..0000000000 --- a/src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include - -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)); -} -- cgit v1.2.3