From a33e8429086f4fcc3e84a6ba2e9037f4f2b47bac Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 28 Nov 2022 23:33:58 +0300 Subject: coreboot: add x230edp_12mb, remove x230fhd_12mb New x230edp_12mb target uses the https://review.coreboot.org/c/coreboot/+/28950 patchset to add an X230_EDP target to the default coreboot branch. Consequently the "fhd" coreboot branch is no longer needed and has been safely removed. --- .../0001-lenovo-x230-introduce-FHD-variant.patch | 198 --------------------- ...o-X230-patch-gfx_uma_size-224M-by-default.patch | 21 --- ...230-set-me_state-Disabled-in-cmos.default.patch | 38 ---- .../0004-specifically-use-python3-in-scripts.patch | 36 ---- ...-Revert-lenovo-x230-introduce-FHD-variant.patch | 169 ------------------ ...rectly-modify-lenovo-x230-instead-for-fhd.patch | 37 ---- .../patches/0007-fix-crossgcc-build-error.patch | 55 ------ 7 files changed, 554 deletions(-) delete mode 100644 resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch delete mode 100644 resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch delete mode 100644 resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch delete mode 100644 resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch delete mode 100644 resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch delete mode 100644 resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch delete mode 100644 resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch (limited to 'resources/coreboot/fhd/patches') diff --git a/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch b/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch deleted file mode 100644 index fb9ff8e7..00000000 --- a/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 53ebc7b1b9b59cc831383ed71478536c9e183d00 Mon Sep 17 00:00:00 2001 -From: Alexander Couzens -Date: Sat, 19 Mar 2022 13:42:33 +0000 -Subject: [PATCH 1/7] lenovo/x230: introduce FHD variant - -There is a modification for the x230 which uses the 2nd DP from the dock -as the integrated panel's connection, which allows using a custom eDP -panel instead of the stock LVDS display. - -There are several adapter boards present on the market and all of them -uses the same method of enabling the custom eDP panel. - -To make this work with coreboot, the internal LVDS connector should be -disabled in libgfxinit. The VBT has been modified as well, which allows -brightness controls to work out of the box. - -The modifications done to the VBT are: -- Remove the LVDS port entry. -- Move the DP-3 (which is the 2nd DP on the dock) entry to the first - position on the list. -- Set the DP-3 as internally connected. - -This has been reported to work with the following panels: -- LP125WF2-SPB4 (1920*1080, 12.5") -- LQ125T1JW02 (2560*1440, 12.5") -- LQ133M1JW21 (1920*1080, 13.3") -- LTN133HL10-201 (1920*1080, 13.3") -- B133HAN04.6 (1920*1080, 13.3") -- B133QAN02.0 (2560*1600, 13.3") - -Other eDP panels not on this list should work as well. - -Change-Id: I0355d39a61956792e69bccd5274cfc2749d72bf0 -Signed-off-by: Alexander Couzens -Signed-off-by: Felix Singer ---- - 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 0 -> 4281 bytes - .../x230/variants/x230_edp/gma-mainboard.ads | 21 ++++++++++++++++++ - 5 files changed, 38 insertions(+), 6 deletions(-) - create mode 100644 src/mainboard/lenovo/x230/variants/x230_edp/data.vbt - create 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 a6fd796206..7aa5af6d85 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 || BOARD_LENOVO_X230S || BOARD_LENOVO_X230_EDP - - 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 -+ select BOARD_ROMSIZE_KB_12288 if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230_EDP - 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 -+ select MAINBOARD_HAS_TPM1 if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230_EDP - select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_PANEL_1_ON_LVDS if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T - select INTEL_GMA_HAVE_VBT -@@ -51,17 +51,20 @@ config MAINBOARD_DIR - default "lenovo/x230" - - config VARIANT_DIR -- default "x230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T -+ default "x230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230_EDP - default "x230s" if BOARD_LENOVO_X230S - - config MAINBOARD_PART_NUMBER -- default "ThinkPad X230" if BOARD_LENOVO_X230 -+ default "ThinkPad X230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230_EDP - 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 -@@ -83,4 +86,4 @@ config PS2M_EISAID - config THINKPADEC_HKEY_EISAID - default "LEN0068" - --endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S -+endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T || BOARD_LENOVO_X230S || BOARD_LENOVO_X230_EDP -diff --git a/src/mainboard/lenovo/x230/Kconfig.name b/src/mainboard/lenovo/x230/Kconfig.name -index 1a01436879..e7290a12dd 100644 ---- a/src/mainboard/lenovo/x230/Kconfig.name -+++ b/src/mainboard/lenovo/x230/Kconfig.name -@@ -6,3 +6,6 @@ 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 8e801f145d..6e6f9f90b9 100644 ---- a/src/mainboard/lenovo/x230/Makefile.inc -+++ b/src/mainboard/lenovo/x230/Makefile.inc -@@ -5,4 +5,9 @@ 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 -new file mode 100644 -index 0000000000000000000000000000000000000000..13384d45571ff76e592335143d01315e37893186 -GIT binary patch -literal 4281 -zcmdT`Z)_aZ5&ym0y}P}=-MjTVC6^p6b={56T^4V^SA+LolmX+RUx+79#iSqiP~ars*|P{j#W<|Sw32Qpw?S@B$TK! -zT%y8#_th3_%L^xJRhpi?y+F#XZ5B@+U98gh$p??rmIq1sVr%N_-*;O-QJ>e_m+#Gc -zeSJjvzQO*1!F<1Mj*JdZ9IBMcg_+XCI898^NNKt-Jw1A;SiXxYQxjvQVrgb{#5RMi -z3_rAVdim%B-#tOO;ZDl)3wi>F!IEkCq2;B0R9IZ3DP?n3(8mm!Gbk$bf{?ofjp)+WX;f0xKuMreM_FPop&M`zu|-4&b{lx} -z6dXr%nIN^a1Q1g^?g`SApyQo+We^Ju;y^Soa0Kxp0ExE)gG^{(s5wk=5)@Iwe?zpD -z@%1v$crW@+c=`T;{ewfYIC5a@V7W3iGdp+pJ^l}V_@k99K7NB27i?KEp$JF`50mi@ -zjG1XXrseRG7Qw69ek|x~_*Klqd$9}}jBGpu*K}~RX~1KAld;P%uwb}2&iFCo7mQyT -zCSGP-Wc-%#2gY9*A29yLh$l?6F>Yks%;;r&gE7oF#P|+lf$=@YNyZt*N3Nz%%kOxj$xHTH_I6i5-#j$7@-%=}( -z?1954MnX?xAuk79(< -zSr6;_4gTc~tacpa=As!xD;@CT7xX)U4}W57_`9~2NpCP65!^@JyGbYMG6B#@{r1i&qF#431THdvdmK?gb!}@x&d86kH8RtSun)L -zMg&qo8p@sxlqPr)H*t1i5Xc8fNK*dW_}wA77I--u)J{nAs;))bo8vk&YfS^jD1^rM=s>0ytuB(VlIOTx;M223I$qhjl3%0pyLp$ECQ*_^UYE{?(M!zFMP3W9I_cUj9w4&M7&s8K0k@rirz}Oms94I6gg>kPulEG+g%^&e&n+7+xV#SfijjY{5o+C7V}H- -zZs9PGrN7SK-OZ8YGZ>yr(&i#tdss~q`sQ|0&fnIIOUJ;O2*-=b;v=kW?O}6KsoH4P -z0smI&%EQn#cd@w$RZTVP=TtP?l7~|?nRTSIQO2qkgO+Z!=3#T$D-XeMvn68}T3Ey8 -zHleye(7mkLXe*JtfA{Q*lj!gc)Wck4IFj|C#q&~HiNmA&>Z|kF4(Uvj%v~DWNT8*x>a2}rST)i~8vd61DwO!2$JZMNNi6hyH -z2d_)6&979w%w$-vyatVrqw??t&t%}iZhDAP3%j_I#cGANdzLq>W;J(F=Xwkxxj%^H -zwQDmn=w}|@-y`RG{*wz0>A(ZGtk~AM=#-fE(LV1uZE98+Nk>UmiyyuJ8?## Disabled); -+ -+end GMA.Mainboard; --- -2.25.1 - diff --git a/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch b/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch deleted file mode 100644 index c2b037da..00000000 --- a/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch +++ /dev/null @@ -1,21 +0,0 @@ -From cabd40fee5fddd9884f93cf0d93c3f03013fae8b Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 24 Jul 2022 14:46:54 +0100 -Subject: [PATCH 2/7] Lenovo X230 patch: gfx_uma_size 224M by default - ---- - src/mainboard/lenovo/x230/cmos.default | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/x230/cmos.default b/src/mainboard/lenovo/x230/cmos.default -index 7314066c2b..2e315d4521 100644 ---- a/src/mainboard/lenovo/x230/cmos.default -+++ b/src/mainboard/lenovo/x230/cmos.default -@@ -16,3 +16,4 @@ backlight=Both - usb_always_on=Disable - f1_to_f12_as_primary=Enable - me_state=Normal -+gfx_uma_size=224M --- -2.25.1 - diff --git a/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch b/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch deleted file mode 100644 index a8f53930..00000000 --- a/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fb3aa1522900bd892d2ce0412bbecddf30ab5aa6 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 24 Jul 2022 14:49:50 +0100 -Subject: [PATCH 3/7] lenovo/x230: set me_state=Disabled in cmos.default - -I only recently found out about this. It's possible to use me_cleaner to -do the same thing, but some people might just flash coreboot and not do -anything with the ME region - -With this change, the ME is set to disabled. It's my understanding that this -will accomplish more or less the same thing as me_cleaner, without actually -using that. Of course, I still recommend using me_cleaner - -I saw this when I audited coreboot's git history, and saw this: - -commit 833e9bad4762e0dca6c867d3a18dbaf6d5166be8 -Author: Evgeny Zinoviev -Date: Thu Nov 21 21:47:31 2019 +0300 - - sb/intel/bd82x6x: Support ME Soft Temporary Disable Mode ---- - src/mainboard/lenovo/x230/cmos.default | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/x230/cmos.default b/src/mainboard/lenovo/x230/cmos.default -index 2e315d4521..3585cbd58b 100644 ---- a/src/mainboard/lenovo/x230/cmos.default -+++ b/src/mainboard/lenovo/x230/cmos.default -@@ -15,5 +15,5 @@ trackpoint=Enable - backlight=Both - usb_always_on=Disable - f1_to_f12_as_primary=Enable --me_state=Normal -+me_state=Disabled - gfx_uma_size=224M --- -2.25.1 - diff --git a/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch b/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch deleted file mode 100644 index e82fedff..00000000 --- a/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 92451357450641eb793904ad2654f0a4aa9ec08d Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 24 Jul 2022 14:52:26 +0100 -Subject: [PATCH 4/7] specifically use python3, in scripts - ---- - src/drivers/intel/fsp2_0/Makefile.inc | 2 +- - util/spdtool/spdtool.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc -index f5641ac182..d807320f29 100644 ---- a/src/drivers/intel/fsp2_0/Makefile.inc -+++ b/src/drivers/intel/fsp2_0/Makefile.inc -@@ -87,7 +87,7 @@ endif - - ifeq ($(CONFIG_FSP_FULL_FD),y) - $(obj)/Fsp_M.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) $(DOTCONFIG) -- python 3rdparty/fsp/Tools/SplitFspBin.py split -f $(CONFIG_FSP_FD_PATH) -o "$(obj)" -n "Fsp.fd" -+ python3 3rdparty/fsp/Tools/SplitFspBin.py split -f $(CONFIG_FSP_FD_PATH) -o "$(obj)" -n "Fsp.fd" - - $(obj)/Fsp_S.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) $(obj)/Fsp_M.fd - true -diff --git a/util/spdtool/spdtool.py b/util/spdtool/spdtool.py -index 89976eac59..2cd7027377 100644 ---- a/util/spdtool/spdtool.py -+++ b/util/spdtool/spdtool.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # spdtool - Tool for partial deblobbing of UEFI firmware images - # SPDX-License-Identifier: GPL-3.0-or-later - # --- -2.25.1 - diff --git a/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch b/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch deleted file mode 100644 index 49362bfc..00000000 --- a/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch +++ /dev/null @@ -1,169 +0,0 @@ -From b91490d6f72010d49fd102373533a4c3a5034f15 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -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 -zcmdT`Z)_aZ5&ym0y}P}=-MjTVC6^p6b={56T^4V^SA+LolmX+RUx+79#iSqiP~ars*|P{j#W<|Sw32Qpw?S@B$TK! -zT%y8#_th3_%L^xJRhpi?y+F#XZ5B@+U98gh$p??rmIq1sVr%N_-*;O-QJ>e_m+#Gc -zeSJjvzQO*1!F<1Mj*JdZ9IBMcg_+XCI898^NNKt-Jw1A;SiXxYQxjvQVrgb{#5RMi -z3_rAVdim%B-#tOO;ZDl)3wi>F!IEkCq2;B0R9IZ3DP?n3(8mm!Gbk$bf{?ofjp)+WX;f0xKuMreM_FPop&M`zu|-4&b{lx} -z6dXr%nIN^a1Q1g^?g`SApyQo+We^Ju;y^Soa0Kxp0ExE)gG^{(s5wk=5)@Iwe?zpD -z@%1v$crW@+c=`T;{ewfYIC5a@V7W3iGdp+pJ^l}V_@k99K7NB27i?KEp$JF`50mi@ -zjG1XXrseRG7Qw69ek|x~_*Klqd$9}}jBGpu*K}~RX~1KAld;P%uwb}2&iFCo7mQyT -zCSGP-Wc-%#2gY9*A29yLh$l?6F>Yks%;;r&gE7oF#P|+lf$=@YNyZt*N3Nz%%kOxj$xHTH_I6i5-#j$7@-%=}( -z?1954MnX?xAuk79(< -zSr6;_4gTc~tacpa=As!xD;@CT7xX)U4}W57_`9~2NpCP65!^@JyGbYMG6B#@{r1i&qF#431THdvdmK?gb!}@x&d86kH8RtSun)L -zMg&qo8p@sxlqPr)H*t1i5Xc8fNK*dW_}wA77I--u)J{nAs;))bo8vk&YfS^jD1^rM=s>0ytuB(VlIOTx;M223I$qhjl3%0pyLp$ECQ*_^UYE{?(M!zFMP3W9I_cUj9w4&M7&s8K0k@rirz}Oms94I6gg>kPulEG+g%^&e&n+7+xV#SfijjY{5o+C7V}H- -zZs9PGrN7SK-OZ8YGZ>yr(&i#tdss~q`sQ|0&fnIIOUJ;O2*-=b;v=kW?O}6KsoH4P -z0smI&%EQn#cd@w$RZTVP=TtP?l7~|?nRTSIQO2qkgO+Z!=3#T$D-XeMvn68}T3Ey8 -zHleye(7mkLXe*JtfA{Q*lj!gc)Wck4IFj|C#q&~HiNmA&>Z|kF4(Uvj%v~DWNT8*x>a2}rST)i~8vd61DwO!2$JZMNNi6hyH -z2d_)6&979w%w$-vyatVrqw??t&t%}iZhDAP3%j_I#cGANdzLq>W;J(F=Xwkxxj%^H -zwQDmn=w}|@-y`RG{*wz0>A(ZGtk~AM=#-fE(LV1uZE98+Nk>UmiyyuJ8?## Disabled); -- --end GMA.Mainboard; --- -2.25.1 - diff --git a/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch b/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch deleted file mode 100644 index 83eb922e..00000000 --- a/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b07677830d698660f6a4a4dd15767fcbfb1e8478 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 24 Jul 2022 18:29:01 +0100 -Subject: [PATCH 6/7] directly modify lenovo/x230 instead (for fhd) - -i kept having build issues. it's a simple patch. ---- - .../lenovo/x230/variants/x230/data.vbt | Bin 4281 -> 4281 bytes - .../x230/variants/x230/gma-mainboard.ads | 1 - - 2 files changed, 1 deletion(-) - -diff --git a/src/mainboard/lenovo/x230/variants/x230/data.vbt b/src/mainboard/lenovo/x230/variants/x230/data.vbt -index 0f50d706c1e943302f598ebc5534dec5080b532c..13384d45571ff76e592335143d01315e37893186 100644 -GIT binary patch -delta 58 -zcmdm~xKnXM6(iHJiplpGWhc*Mbef#XrZYKN0A_^~ -AE&u=k - -delta 84 -zcmdm~xKnXM6{ED000RUlfG8FQ24)DCL4jfNR7N)z1%_)0lWQ1dC&x1>PX55iJvoa> -T44K}X#dM6Bk#DmhTL%{aog@;; - -diff --git a/src/mainboard/lenovo/x230/variants/x230/gma-mainboard.ads b/src/mainboard/lenovo/x230/variants/x230/gma-mainboard.ads -index 3df1e37f3e..f7cf0bc264 100644 ---- a/src/mainboard/lenovo/x230/variants/x230/gma-mainboard.ads -+++ b/src/mainboard/lenovo/x230/variants/x230/gma-mainboard.ads -@@ -16,7 +16,6 @@ private package GMA.Mainboard is - HDMI2, - HDMI3, - Analog, -- LVDS, - others => Disabled); - - end GMA.Mainboard; --- -2.25.1 - diff --git a/resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch b/resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch deleted file mode 100644 index d75bc733..00000000 --- a/resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d65dc4f977d095e4f4b71522d85fc22fcf452fe8 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sat, 19 Nov 2022 14:55:44 +0000 -Subject: [PATCH 7/7] fix crossgcc build error - ---- - util/crossgcc/patches/gcc-11.2.0_gnat.patch | 32 ++++++++++++++++++++- - 1 file changed, 31 insertions(+), 1 deletion(-) - -diff --git a/util/crossgcc/patches/gcc-11.2.0_gnat.patch b/util/crossgcc/patches/gcc-11.2.0_gnat.patch -index 2d7cecee24..c22cec45d0 100644 ---- a/util/crossgcc/patches/gcc-11.2.0_gnat.patch -+++ b/util/crossgcc/patches/gcc-11.2.0_gnat.patch -@@ -5,7 +5,37 @@ - - # Extra flags to pass to recursive makes. - -COMMON_ADAFLAGS= -gnatpg --+COMMON_ADAFLAGS= -gnatpg -gnatwGUR -++COMMON_ADAFLAGS= -gnatpg -gnatwn - ifeq ($(TREECHECKING),) - CHECKING_ADAFLAGS= - else -+diff -Nurp gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in -+--- gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:31:57.993273717 +0200 -++++ gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:30:50.214166847 +0200 -+@@ -334,6 +334,7 @@ GNAT_ADA_OBJS = \ -+ ada/hostparm.o \ -+ ada/impunit.o \ -+ ada/inline.o \ -++ ada/libgnat/i-c.o \ -+ ada/libgnat/interfac.o \ -+ ada/itypes.o \ -+ ada/krunch.o \ -+@@ -364,7 +365,10 @@ GNAT_ADA_OBJS = \ -+ ada/rtsfind.o \ -+ ada/libgnat/s-addope.o \ -+ ada/libgnat/s-addima.o \ -++ ada/libgnat/s-aotase.o \ -+ ada/libgnat/s-assert.o \ -++ ada/libgnat/s-atoope.o \ -++ ada/libgnat/s-atopri.o \ -+ ada/libgnat/s-bitops.o \ -+ ada/libgnat/s-carun8.o \ -+ ada/libgnat/s-casuti.o \ -+@@ -548,6 +552,7 @@ GNATBIND_OBJS = \ -+ ada/hostparm.o \ -+ ada/init.o \ -+ ada/initialize.o \ -++ ada/libgnat/i-c.o \ -+ ada/libgnat/interfac.o \ -+ ada/krunch.o \ -+ ada/lib.o \ --- -2.25.1 - -- cgit v1.2.1