diff options
author | Alexei Sorokin <sor.alexei@meowr.ru> | 2022-11-28 23:33:58 +0300 |
---|---|---|
committer | Alexei Sorokin <sor.alexei@meowr.ru> | 2022-11-28 23:33:58 +0300 |
commit | a33e8429086f4fcc3e84a6ba2e9037f4f2b47bac (patch) | |
tree | ce66e769ef56f39dabca87637fa3914157633d98 /resources | |
parent | e8eee6dd8a9393567330905bcddad2eb4a232e8e (diff) |
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.
Diffstat (limited to 'resources')
13 files changed, 63 insertions, 417 deletions
diff --git a/resources/blobs/sources b/resources/blobs/sources index 0a148f9f..aeb03783 100644 --- a/resources/blobs/sources +++ b/resources/blobs/sources @@ -5,7 +5,7 @@ # If you want to make additions, try to add a backup url for download links and # list hashes as sha1 sums. -{x230 x230t x230i t430 x230fhd}{ +{x230 x230t x230i t430 x230edp}{ ME_hash 039c89c6d44ae11ae2510cbd5fed756e97ed9a31 ME_dl https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe ME_bkup_dl https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe diff --git a/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch b/resources/coreboot/default/patches/0015-lenovo-x230-introduce-EDP-variant.patch index fb9ff8e7..793d3dc0 100644 --- a/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch +++ b/resources/coreboot/default/patches/0015-lenovo-x230-introduce-EDP-variant.patch @@ -1,7 +1,7 @@ -From 53ebc7b1b9b59cc831383ed71478536c9e183d00 Mon Sep 17 00:00:00 2001 +From 06fe32bb5f65c784e7819b875c505fcceab11b99 Mon Sep 17 00:00:00 2001 From: Alexander Couzens <lynxis@fe80.eu> Date: Sat, 19 Mar 2022 13:42:33 +0000 -Subject: [PATCH 1/7] lenovo/x230: introduce FHD variant +Subject: [PATCH] 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 @@ -65,7 +65,7 @@ index a6fd796206..7aa5af6d85 100644 @@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS select INTEL_INT15 select DRIVERS_RICOH_RCE822 - select MEMORY_MAPPED_TPM + select MAINBOARD_HAS_LPC_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 diff --git a/resources/coreboot/default/patches/0016-lenovo-x230-fix-data.vbt-for-EDP.patch b/resources/coreboot/default/patches/0016-lenovo-x230-fix-data.vbt-for-EDP.patch new file mode 100644 index 00000000..cade294e --- /dev/null +++ b/resources/coreboot/default/patches/0016-lenovo-x230-fix-data.vbt-for-EDP.patch @@ -0,0 +1,26 @@ +From 62cd7b24205122d366526aea1e3ad0c15ec8210f Mon Sep 17 00:00:00 2001 +From: Alexei Sorokin <sor.alexei@meowr.ru> +Date: Sun, 27 Nov 2022 18:36:26 +0300 +Subject: [PATCH] lenovo/x230: fix the data.vbt path for the EDP variant + +--- + src/mainboard/lenovo/x230/Kconfig | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig +index b8cae24199..d72b6f8aea 100644 +--- a/src/mainboard/lenovo/x230/Kconfig ++++ b/src/mainboard/lenovo/x230/Kconfig +@@ -62,9 +62,6 @@ config MAINBOARD_PART_NUMBER + 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 +-- +2.25.1 + diff --git a/resources/coreboot/fhd/board.cfg b/resources/coreboot/fhd/board.cfg deleted file mode 100644 index 2716ff3d..00000000 --- a/resources/coreboot/fhd/board.cfg +++ /dev/null @@ -1,4 +0,0 @@ -cbtree="fhd" -romtype="normal" -cbrevision="0feef9981428eaa1cb94701d260ba8123dd79c35" -arch="x86_64" 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 <leah@libreboot.org> -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 <leah@libreboot.org> -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 <me@ch1p.io> -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 <leah@libreboot.org> -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 <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 - 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 <leah@libreboot.org> -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#XrZYK<No?`~W^QzPa~9JvW=6TqhHM>N0A_^~ -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 <leah@libreboot.org> -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 - diff --git a/resources/coreboot/x230fhd_12mb/board.cfg b/resources/coreboot/x230edp_12mb/board.cfg index 935d216f..e7626cf1 100644 --- a/resources/coreboot/x230fhd_12mb/board.cfg +++ b/resources/coreboot/x230edp_12mb/board.cfg @@ -1,4 +1,4 @@ -cbtree="fhd" +cbtree="default" romtype="normal" arch="x86_64" payload_grub="y" diff --git a/resources/coreboot/x230fhd_12mb/config/libgfxinit_corebootfb b/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb index fe7aba00..bc078917 100644 --- a/resources/coreboot/x230fhd_12mb/config/libgfxinit_corebootfb +++ b/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb @@ -92,7 +92,6 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_SCALEWAY is not set # CONFIG_VENDOR_SIEMENS is not set # CONFIG_VENDOR_SIFIVE is not set -# CONFIG_VENDOR_STARLABS is not set # CONFIG_VENDOR_SUPERMICRO is not set # CONFIG_VENDOR_SYSTEM76 is not set # CONFIG_VENDOR_TI is not set @@ -109,12 +108,8 @@ CONFIG_FMDFILE="" # CONFIG_NO_POST is not set CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_CBFS_SIZE=0xBE0000 -CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600 -CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560 -CONFIG_MAX_CPUS=8 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set -CONFIG_POST_DEVICE=y -CONFIG_POST_IO=y +CONFIG_MAX_CPUS=8 # CONFIG_VBOOT is not set CONFIG_VBOOT_VBNV_OFFSET=0x2a CONFIG_VARIANT_DIR="x230" @@ -124,6 +119,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" CONFIG_DRAM_RESET_GATE_GPIO=10 CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 +CONFIG_POST_IO=y CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout" @@ -131,6 +127,9 @@ CONFIG_USBDEBUG_HCD_INDEX=2 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 # CONFIG_CONSOLE_POST is not set CONFIG_TPM_PIRQ=0x0 +CONFIG_POST_DEVICE=y +CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560 +CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" CONFIG_DCACHE_RAM_BASE=0xfefe0000 CONFIG_DCACHE_RAM_SIZE=0x20000 @@ -185,21 +184,21 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000 # CONFIG_BOARD_LENOVO_X220 is not set # CONFIG_BOARD_LENOVO_X220I is not set # CONFIG_BOARD_LENOVO_X1 is not set -CONFIG_BOARD_LENOVO_X230=y +# CONFIG_BOARD_LENOVO_X230 is not set # CONFIG_BOARD_LENOVO_X230T is not set # CONFIG_BOARD_LENOVO_X230S is not set +CONFIG_BOARD_LENOVO_X230_EDP=y # CONFIG_BOARD_LENOVO_X60 is not set CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0020" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_VBOOT_SLOTS_RW_AB=y CONFIG_DRIVER_LENOVO_SERIALS=y -CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" +CONFIG_GFX_GMA_PANEL_1_PORT="eDP" # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_HEAP_SIZE=0x4000 -CONFIG_EC_GPE_SCI=0x50 CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -238,6 +237,7 @@ CONFIG_CHIPSET_DEVICETREE="" CONFIG_CBFS_MCACHE_SIZE=0x4000 CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 +CONFIG_RAMBASE=0xe00000 CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 @@ -257,6 +257,7 @@ CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +CONFIG_AZALIA_MAX_CODECS=4 CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_UART_PCI_ADDR=0x0 @@ -350,8 +351,8 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 # CONFIG_EC_ACPI=y CONFIG_EC_LENOVO_H8=y -CONFIG_H8_BEEP_ON_DEATH=y -CONFIG_H8_FLASH_LEDS_ON_DEATH=y +# CONFIG_H8_BEEP_ON_DEATH is not set +# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set # CONFIG_H8_SUPPORT_BT_ON_WIFI is not set CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y CONFIG_EC_LENOVO_PMH7=y @@ -378,10 +379,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y CONFIG_HAVE_EXP_X86_64_SUPPORT=y # CONFIG_USE_EXP_X86_64_SUPPORT is not set +CONFIG_RAMTOP=0x1000000 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y CONFIG_NUM_IPI_STARTS=2 CONFIG_PC80_SYSTEM=y CONFIG_HAVE_CMOS_DEFAULT=y +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y # CONFIG_BOOTBLOCK_NORMAL is not set @@ -418,7 +421,6 @@ CONFIG_ECAM_MMCONF_LENGTH=0x04000000 CONFIG_PCI_ALLOW_BUS_MASTER=y CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y -# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y # CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set CONFIG_PCIEXP_HOTPLUG_IO=0x2000 @@ -428,7 +430,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 CONFIG_INTEL_GMA_HAVE_VBT=y CONFIG_INTEL_GMA_ADD_VBT=y # CONFIG_SOFTWARE_I2C is not set -CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 CONFIG_RESOURCE_ALLOCATOR_V4=y # end of Devices @@ -463,13 +464,11 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_USBDEBUG is not set # CONFIG_VPD is not set # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set CONFIG_INTEL_INT15=y CONFIG_INTEL_GMA_ACPI=y CONFIG_GFX_GMA=y -CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y +CONFIG_GFX_GMA_PANEL_1_ON_EDP=y CONFIG_INTEL_GMA_OPREGION_2_0=y CONFIG_GFX_GMA_DYN_CPU=y CONFIG_GFX_GMA_GENERATION="Ironlake" @@ -479,7 +478,7 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set -CONFIG_MEMORY_MAPPED_TPM=y +CONFIG_MAINBOARD_HAS_LPC_TPM=y CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 CONFIG_DRIVERS_RICOH_RCE822=y # CONFIG_DRIVERS_SIL_3114 is not set @@ -490,12 +489,6 @@ CONFIG_DRIVERS_RICOH_RCE822=y # # -# CBFS verification -# -# CONFIG_CBFS_VERIFICATION is not set -# end of CBFS verification - -# # Verified Boot (vboot) # # end of Verified Boot (vboot) @@ -520,7 +513,6 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y # end of Memory initialization -# CONFIG_INTEL_TXT is not set # CONFIG_STM is not set CONFIG_BOOTMEDIA_LOCK_NONE=y # CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set @@ -558,8 +550,6 @@ CONFIG_CONSOLE_CBMEM=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0 -CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y -CONFIG_CONSOLE_USE_ANSI_ESCAPES=y # CONFIG_CMOS_POST is not set CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set @@ -638,7 +628,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SPI_FLASH is not set # CONFIG_DEBUG_BOOT_STATE is not set # CONFIG_DEBUG_ADA_CODE is not set -CONFIG_HAVE_EM100_SUPPORT=y +# CONFIG_HAVE_EM100_SUPPORT is not set # CONFIG_EM100 is not set # end of Debugging diff --git a/resources/coreboot/x230fhd_12mb/config/libgfxinit_txtmode b/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode index 52bad67a..4f28b857 100644 --- a/resources/coreboot/x230fhd_12mb/config/libgfxinit_txtmode +++ b/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode @@ -92,7 +92,6 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_SCALEWAY is not set # CONFIG_VENDOR_SIEMENS is not set # CONFIG_VENDOR_SIFIVE is not set -# CONFIG_VENDOR_STARLABS is not set # CONFIG_VENDOR_SUPERMICRO is not set # CONFIG_VENDOR_SYSTEM76 is not set # CONFIG_VENDOR_TI is not set @@ -109,10 +108,8 @@ CONFIG_FMDFILE="" # CONFIG_NO_POST is not set CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_CBFS_SIZE=0xBE0000 -CONFIG_MAX_CPUS=8 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set -CONFIG_POST_DEVICE=y -CONFIG_POST_IO=y +CONFIG_MAX_CPUS=8 # CONFIG_VBOOT is not set CONFIG_VBOOT_VBNV_OFFSET=0x2a CONFIG_VARIANT_DIR="x230" @@ -122,6 +119,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" CONFIG_DRAM_RESET_GATE_GPIO=10 CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 +CONFIG_POST_IO=y CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout" @@ -129,6 +127,7 @@ CONFIG_USBDEBUG_HCD_INDEX=2 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 # CONFIG_CONSOLE_POST is not set CONFIG_TPM_PIRQ=0x0 +CONFIG_POST_DEVICE=y CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" CONFIG_DCACHE_RAM_BASE=0xfefe0000 CONFIG_DCACHE_RAM_SIZE=0x20000 @@ -183,21 +182,21 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000 # CONFIG_BOARD_LENOVO_X220 is not set # CONFIG_BOARD_LENOVO_X220I is not set # CONFIG_BOARD_LENOVO_X1 is not set -CONFIG_BOARD_LENOVO_X230=y +# CONFIG_BOARD_LENOVO_X230 is not set # CONFIG_BOARD_LENOVO_X230T is not set # CONFIG_BOARD_LENOVO_X230S is not set +CONFIG_BOARD_LENOVO_X230_EDP=y # CONFIG_BOARD_LENOVO_X60 is not set CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0020" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_VBOOT_SLOTS_RW_AB=y CONFIG_DRIVER_LENOVO_SERIALS=y -CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" +CONFIG_GFX_GMA_PANEL_1_PORT="eDP" # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_HEAP_SIZE=0x4000 -CONFIG_EC_GPE_SCI=0x50 CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -236,6 +235,7 @@ CONFIG_CHIPSET_DEVICETREE="" CONFIG_CBFS_MCACHE_SIZE=0x4000 CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 +CONFIG_RAMBASE=0xe00000 CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 @@ -255,6 +255,7 @@ CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +CONFIG_AZALIA_MAX_CODECS=4 CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_UART_PCI_ADDR=0x0 @@ -348,8 +349,8 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 # CONFIG_EC_ACPI=y CONFIG_EC_LENOVO_H8=y -CONFIG_H8_BEEP_ON_DEATH=y -CONFIG_H8_FLASH_LEDS_ON_DEATH=y +# CONFIG_H8_BEEP_ON_DEATH is not set +# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set # CONFIG_H8_SUPPORT_BT_ON_WIFI is not set CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y CONFIG_EC_LENOVO_PMH7=y @@ -376,10 +377,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y CONFIG_HAVE_EXP_X86_64_SUPPORT=y # CONFIG_USE_EXP_X86_64_SUPPORT is not set +CONFIG_RAMTOP=0x1000000 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y CONFIG_NUM_IPI_STARTS=2 CONFIG_PC80_SYSTEM=y CONFIG_HAVE_CMOS_DEFAULT=y +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y # CONFIG_BOOTBLOCK_NORMAL is not set @@ -414,7 +417,6 @@ CONFIG_ECAM_MMCONF_LENGTH=0x04000000 CONFIG_PCI_ALLOW_BUS_MASTER=y CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y -# CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS is not set CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y # CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set CONFIG_PCIEXP_HOTPLUG_IO=0x2000 @@ -424,7 +426,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 CONFIG_INTEL_GMA_HAVE_VBT=y CONFIG_INTEL_GMA_ADD_VBT=y # CONFIG_SOFTWARE_I2C is not set -CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 CONFIG_RESOURCE_ALLOCATOR_V4=y # end of Devices @@ -459,13 +460,11 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_USBDEBUG is not set # CONFIG_VPD is not set # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set -# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set CONFIG_INTEL_INT15=y CONFIG_INTEL_GMA_ACPI=y CONFIG_GFX_GMA=y -CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y +CONFIG_GFX_GMA_PANEL_1_ON_EDP=y CONFIG_INTEL_GMA_OPREGION_2_0=y CONFIG_GFX_GMA_DYN_CPU=y CONFIG_GFX_GMA_GENERATION="Ironlake" @@ -475,7 +474,7 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set -CONFIG_MEMORY_MAPPED_TPM=y +CONFIG_MAINBOARD_HAS_LPC_TPM=y CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 CONFIG_VGA=y CONFIG_DRIVERS_RICOH_RCE822=y @@ -487,12 +486,6 @@ CONFIG_DRIVERS_RICOH_RCE822=y # # -# CBFS verification -# -# CONFIG_CBFS_VERIFICATION is not set -# end of CBFS verification - -# # Verified Boot (vboot) # # end of Verified Boot (vboot) @@ -517,7 +510,6 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y # end of Memory initialization -# CONFIG_INTEL_TXT is not set # CONFIG_STM is not set CONFIG_BOOTMEDIA_LOCK_NONE=y # CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set @@ -555,8 +547,6 @@ CONFIG_CONSOLE_CBMEM=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0 -CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y -CONFIG_CONSOLE_USE_ANSI_ESCAPES=y # CONFIG_CMOS_POST is not set CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set @@ -635,7 +625,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SPI_FLASH is not set # CONFIG_DEBUG_BOOT_STATE is not set # CONFIG_DEBUG_ADA_CODE is not set -CONFIG_HAVE_EM100_SUPPORT=y +# CONFIG_HAVE_EM100_SUPPORT is not set # CONFIG_EM100 is not set # end of Debugging |