| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170 |
- From b91490d6f72010d49fd102373533a4c3a5034f15 Mon Sep 17 00:00:00 2001
- From: Leah Rowe <leah@libreboot.org>
- Date: Sun, 24 Jul 2022 18:23:24 +0100
- Subject: [PATCH 5/7] Revert "lenovo/x230: introduce FHD variant"
- This reverts commit d898a4300d614bd2927cbf61ba1901bf120edb4e.
- ---
- src/mainboard/lenovo/x230/Kconfig | 15 +++++--------
- src/mainboard/lenovo/x230/Kconfig.name | 3 ---
- src/mainboard/lenovo/x230/Makefile.inc | 5 -----
- .../lenovo/x230/variants/x230_edp/data.vbt | Bin 4281 -> 0 bytes
- .../x230/variants/x230_edp/gma-mainboard.ads | 21 ------------------
- 5 files changed, 6 insertions(+), 38 deletions(-)
- delete mode 100644 src/mainboard/lenovo/x230/variants/x230_edp/data.vbt
- delete mode 100644 src/mainboard/lenovo/x230/variants/x230_edp/gma-mainboard.ads
- diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
- index 7aa5af6d85..a6fd796206 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 || BOARD_LENOVO_X230_EDP
- +if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S
-
- config BOARD_SPECIFIC_OPTIONS
- def_bool y
- @@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
- 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 || BOARD_LENOVO_X230_EDP
- + select BOARD_ROMSIZE_KB_12288 if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
- select BOARD_ROMSIZE_KB_16384 if BOARD_LENOVO_X230S
- select HAVE_ACPI_TABLES
- select HAVE_OPTION_TABLE
- @@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
- select INTEL_INT15
- select DRIVERS_RICOH_RCE822
- select MEMORY_MAPPED_TPM
- - select MAINBOARD_HAS_TPM1 if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230_EDP
- + select MAINBOARD_HAS_TPM1 if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
- select MAINBOARD_HAS_LIBGFXINIT
- select GFX_GMA_PANEL_1_ON_LVDS if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
- select INTEL_GMA_HAVE_VBT
- @@ -51,20 +51,17 @@ config MAINBOARD_DIR
- default "lenovo/x230"
-
- config VARIANT_DIR
- - default "x230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230_EDP
- + default "x230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
- default "x230s" if BOARD_LENOVO_X230S
-
- config MAINBOARD_PART_NUMBER
- - default "ThinkPad X230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230_EDP
- + default "ThinkPad X230" if BOARD_LENOVO_X230
- default "ThinkPad X230t" if BOARD_LENOVO_X230T
- default "ThinkPad X230s" if BOARD_LENOVO_X230S
-
- config OVERRIDE_DEVICETREE
- default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
-
- -config INTEL_GMA_VBT_FILE
- - default "variants/x230_edp/data.vbt" if BOARD_LENOVO_X230_EDP
- -
- config USBDEBUG_HCD_INDEX
- int
- default 2
- @@ -86,4 +83,4 @@ config PS2M_EISAID
- config THINKPADEC_HKEY_EISAID
- default "LEN0068"
-
- -endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S || BOARD_LENOVO_X230_EDP
- +endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S
- diff --git a/src/mainboard/lenovo/x230/Kconfig.name b/src/mainboard/lenovo/x230/Kconfig.name
- index e7290a12dd..1a01436879 100644
- --- a/src/mainboard/lenovo/x230/Kconfig.name
- +++ b/src/mainboard/lenovo/x230/Kconfig.name
- @@ -6,6 +6,3 @@ config BOARD_LENOVO_X230T
-
- config BOARD_LENOVO_X230S
- bool "ThinkPad X230s"
- -
- -config BOARD_LENOVO_X230_EDP
- - bool "ThinkPad X230 eDP Mod (2K/FHD)"
- diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc
- index 6e6f9f90b9..8e801f145d 100644
- --- a/src/mainboard/lenovo/x230/Makefile.inc
- +++ b/src/mainboard/lenovo/x230/Makefile.inc
- @@ -5,9 +5,4 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c
- romstage-y += variants/$(VARIANT_DIR)/early_init.c
- romstage-y += variants/$(VARIANT_DIR)/gpio.c
- ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
- -
- -ifeq ($(CONFIG_BOARD_LENOVO_X230_EDP),y)
- -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/x230_edp/gma-mainboard.ads
- -else
- ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
- -endif
- diff --git a/src/mainboard/lenovo/x230/variants/x230_edp/data.vbt b/src/mainboard/lenovo/x230/variants/x230_edp/data.vbt
- deleted file mode 100644
- index 13384d45571ff76e592335143d01315e37893186..0000000000000000000000000000000000000000
- GIT binary patch
- literal 0
- HcmV?d00001
- literal 4281
- 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
- diff --git a/src/mainboard/lenovo/x230/variants/x230_edp/gma-mainboard.ads b/src/mainboard/lenovo/x230/variants/x230_edp/gma-mainboard.ads
- deleted file mode 100644
- index f7cf0bc264..0000000000
- --- a/src/mainboard/lenovo/x230/variants/x230_edp/gma-mainboard.ads
- +++ /dev/null
- @@ -1,21 +0,0 @@
- --- SPDX-License-Identifier: GPL-2.0-or-later
- -
- -with HW.GFX.GMA;
- -with HW.GFX.GMA.Display_Probing;
- -
- -use HW.GFX.GMA;
- -use HW.GFX.GMA.Display_Probing;
- -
- -private package GMA.Mainboard is
- -
- - ports : constant Port_List :=
- - (DP1,
- - DP2,
- - DP3,
- - HDMI1,
- - HDMI2,
- - HDMI3,
- - Analog,
- - others => Disabled);
- -
- -end GMA.Mainboard;
- --
- 2.25.1
|
