diff options
| author | Felix Singer <felixsinger@posteo.net> | 2020-09-23 18:52:15 +0000 |
|---|---|---|
| committer | Michael Niewöhner <foss@mniewoehner.de> | 2020-09-24 23:35:13 +0000 |
| commit | 1f4b3cdeb0ed9037005b49a83751617f244232cd (patch) | |
| tree | 7877fcdff25cb30042be365cfcb3db750956b402 | |
| parent | a25eaffb69e368015e38695a6b68c2172f421e4c (diff) | |
| download | coreboot-1f4b3cdeb0ed9037005b49a83751617f244232cd.tar.xz | |
mb/clevo/l140cu: Make usage of variant mechanism
Clevo mainboards can be grouped by their common platform. Therefore,
restructure the mainboard directory as a first step, so that the variant
mechanism is used.
This moves most of the code into the variant dir, since the L140CU is
the only variant at the moment.
Change-Id: I9ad1c06f9db854cac1dd420c53dc0c9f010ed716
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45664
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
12 files changed, 22 insertions, 13 deletions
diff --git a/src/mainboard/clevo/l140cu/Kconfig b/src/mainboard/clevo/l140cu/Kconfig index 9012dc6124..c158adddfc 100644 --- a/src/mainboard/clevo/l140cu/Kconfig +++ b/src/mainboard/clevo/l140cu/Kconfig @@ -27,19 +27,23 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER string - default "L140CU" + default "L140CU" if BOARD_CLEVO_L140CU config MAINBOARD_SMBIOS_PRODUCT_NAME string - default "L140CU" + default "L140CU" if BOARD_CLEVO_L140CU config MAINBOARD_VERSION string - default "2.1A" + default "2.1A" if BOARD_CLEVO_L140CU + +config DEVICETREE + string + default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" config CBFS_SIZE hex - default 0xc00000 + default 0xc00000 if BOARD_CLEVO_L140CU config CONSOLE_POST bool @@ -51,11 +55,11 @@ config UART_FOR_CONSOLE config MAX_CPUS int - default 8 + default 8 if BOARD_CLEVO_L140CU config DIMM_MAX int - default 2 + default 2 if BOARD_CLEVO_L140CU config DIMM_SPD_SIZE int @@ -71,10 +75,14 @@ config VGA_BIOS_ID config TPM_PIRQ hex - default 0x10 # GPP_A7/PIRQA# + default 0x10 if BOARD_CLEVO_L140CU # GPP_A7/PIRQA# config POST_DEVICE bool default n +config VARIANT_DIR + string + default "l140cu" if BOARD_CLEVO_L140CU + endif diff --git a/src/mainboard/clevo/l140cu/Makefile.inc b/src/mainboard/clevo/l140cu/Makefile.inc index 3d742d6e13..6a388f27a1 100644 --- a/src/mainboard/clevo/l140cu/Makefile.inc +++ b/src/mainboard/clevo/l140cu/Makefile.inc @@ -1,4 +1 @@ -bootblock-y += bootblock.c -ramstage-y += ramstage.c -ramstage-y += hda_verb.c -SPD_SOURCES = samsung-K4AAG165WA-BCTD +subdirs-y += variants/$(VARIANT_DIR) diff --git a/src/mainboard/clevo/l140cu/board_info.txt b/src/mainboard/clevo/l140cu/board_info.txt index 421aa3dd0b..67109938da 100644 --- a/src/mainboard/clevo/l140cu/board_info.txt +++ b/src/mainboard/clevo/l140cu/board_info.txt @@ -1,7 +1,5 @@ Vendor name: Clevo -Board name: L140CU Category: laptop -Release year: 2020 ROM package: SOIC-8 ROM protocol: SPI ROM socketed: n diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/Makefile.inc b/src/mainboard/clevo/l140cu/variants/l140cu/Makefile.inc new file mode 100644 index 0000000000..3d742d6e13 --- /dev/null +++ b/src/mainboard/clevo/l140cu/variants/l140cu/Makefile.inc @@ -0,0 +1,4 @@ +bootblock-y += bootblock.c +ramstage-y += ramstage.c +ramstage-y += hda_verb.c +SPD_SOURCES = samsung-K4AAG165WA-BCTD diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/board_info.txt b/src/mainboard/clevo/l140cu/variants/l140cu/board_info.txt new file mode 100644 index 0000000000..86230320af --- /dev/null +++ b/src/mainboard/clevo/l140cu/variants/l140cu/board_info.txt @@ -0,0 +1,2 @@ +Board name: L140CU +Release year: 2020 diff --git a/src/mainboard/clevo/l140cu/bootblock.c b/src/mainboard/clevo/l140cu/variants/l140cu/bootblock.c index 2b673021b5..2b673021b5 100644 --- a/src/mainboard/clevo/l140cu/bootblock.c +++ b/src/mainboard/clevo/l140cu/variants/l140cu/bootblock.c diff --git a/src/mainboard/clevo/l140cu/data.vbt b/src/mainboard/clevo/l140cu/variants/l140cu/data.vbt Binary files differindex f14d8073e9..f14d8073e9 100644 --- a/src/mainboard/clevo/l140cu/data.vbt +++ b/src/mainboard/clevo/l140cu/variants/l140cu/data.vbt diff --git a/src/mainboard/clevo/l140cu/devicetree.cb b/src/mainboard/clevo/l140cu/variants/l140cu/devicetree.cb index b1899417b9..b1899417b9 100644 --- a/src/mainboard/clevo/l140cu/devicetree.cb +++ b/src/mainboard/clevo/l140cu/variants/l140cu/devicetree.cb diff --git a/src/mainboard/clevo/l140cu/gpio.h b/src/mainboard/clevo/l140cu/variants/l140cu/gpio.h index 1f7d119947..1f7d119947 100644 --- a/src/mainboard/clevo/l140cu/gpio.h +++ b/src/mainboard/clevo/l140cu/variants/l140cu/gpio.h diff --git a/src/mainboard/clevo/l140cu/hda_verb.c b/src/mainboard/clevo/l140cu/variants/l140cu/hda_verb.c index 7bb073698d..7bb073698d 100644 --- a/src/mainboard/clevo/l140cu/hda_verb.c +++ b/src/mainboard/clevo/l140cu/variants/l140cu/hda_verb.c diff --git a/src/mainboard/clevo/l140cu/ramstage.c b/src/mainboard/clevo/l140cu/variants/l140cu/ramstage.c index 4b0ddd4823..4b0ddd4823 100644 --- a/src/mainboard/clevo/l140cu/ramstage.c +++ b/src/mainboard/clevo/l140cu/variants/l140cu/ramstage.c diff --git a/src/mainboard/clevo/l140cu/romstage.c b/src/mainboard/clevo/l140cu/variants/l140cu/romstage.c index 1af8ce6633..1af8ce6633 100644 --- a/src/mainboard/clevo/l140cu/romstage.c +++ b/src/mainboard/clevo/l140cu/variants/l140cu/romstage.c |