aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/x230/Kconfig
diff options
context:
space:
mode:
authorBill XIE <persmule@hardenedlinux.org>2020-05-18 16:34:37 +0800
committerAlexander Couzens <lynxis@fe80.eu>2020-05-21 02:50:08 +0000
commitcfd78b1500bed6d3d410f984450c45f28b700aa2 (patch)
tree4a3380312f079f6b5639c0b47411268b4bbf1e06 /src/mainboard/lenovo/x230/Kconfig
parent238b10a5f7fb3ca6c4aca37a14f34cafa4306ddf (diff)
Revert "mainboard/lenovo/x230: Add ThinkPad x230s as a variant"
This reverts commit 6b95507ec5b087658178a325bdc68570bc48bb20, in order to recommit and review it again. Change-Id: Id4ddf99200f77016a48d02a8421d080cea492aae Signed-off-by: Bill XIE <persmule@hardenedlinux.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41504 Reviewed-by: Alexander Couzens <lynxis@fe80.eu> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/lenovo/x230/Kconfig')
-rw-r--r--src/mainboard/lenovo/x230/Kconfig24
1 files changed, 6 insertions, 18 deletions
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 577136d103..7d563efb2b 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S
+if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
config BOARD_SPECIFIC_OPTIONS
def_bool y
@@ -9,20 +9,18 @@ config BOARD_SPECIFIC_OPTIONS
select EC_LENOVO_PMH7
select EC_LENOVO_H8
select H8_HAS_BAT_TRESHOLDS_IMPL
- select H8_HAS_PRIMARY_FN_KEYS if BOARD_LENOVO_X230S
select NO_UART_ON_SUPERIO
- select BOARD_ROMSIZE_KB_12288 if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
- select BOARD_ROMSIZE_KB_16384 if BOARD_LENOVO_X230S
+ select BOARD_ROMSIZE_KB_12288
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
select HAVE_CMOS_DEFAULT
select HAVE_ACPI_RESUME
select INTEL_INT15
select DRIVERS_RICOH_RCE822
- select MAINBOARD_HAS_LPC_TPM if !BOARD_LENOVO_X230S
- select MAINBOARD_HAS_TPM1 if !BOARD_LENOVO_X230S
+ select MAINBOARD_HAS_LPC_TPM
+ select MAINBOARD_HAS_TPM1
select MAINBOARD_HAS_LIBGFXINIT
- select GFX_GMA_PANEL_1_ON_LVDS if !BOARD_LENOVO_X230S
+ select GFX_GMA_PANEL_1_ON_LVDS
select INTEL_GMA_HAVE_VBT
select MAINBOARD_USES_IFD_GBE_REGION
@@ -52,20 +50,10 @@ config MAINBOARD_DIR
string
default "lenovo/x230"
-config VARIANT_DIR
- string
- default "x230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
- default "x230s" if BOARD_LENOVO_X230S
-
config MAINBOARD_PART_NUMBER
string
default "ThinkPad X230" if BOARD_LENOVO_X230
default "ThinkPad X230t" if BOARD_LENOVO_X230T
- default "ThinkPad X230s" if BOARD_LENOVO_X230S
-
-config OVERRIDE_DEVICETREE
- string
- default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAX_CPUS
int
@@ -93,4 +81,4 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0020"
-endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S
+endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T