From 60793c552fa0eb1066adcf5e8eec3d5a4bcb7efd Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 19 Nov 2022 03:33:38 +0000 Subject: fix gnat build issue on coreboot repositories backported from newer coreboot revisions, see patch coreboot/default/patches/0014-coreboot-default-fix-crossgcc-build.patch --- ...ok21-Set-default-VRAM-to-64MiB-instead-of.patch | 4 +- ...02-add-c3-and-clockgen-to-apple-macbook21.patch | 4 +- ...64MiB-Video-RAM-changed-to-default-previo.patch | 4 +- ...make-64MiB-VRAM-the-default-in-cmos.defau.patch | 4 +- ...o-t400-set-VRAM-to-352MiB-VRAM-by-default.patch | 4 +- ...lenovo-x200-set-VRAM-to-352MiB-by-default.patch | 4 +- ...a-g41m-es2l-set-VRAM-to-352MiB-by-default.patch | 4 +- ...er-g43t-am3-set-VRAM-to-352MiB-by-default.patch | 4 +- .../0009-lenovo-t400-Enable-all-SATA-ports.patch | 34 +++++++ ...d-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch | 22 +++++ .../0011-lenovo-t400-Enable-all-SATA-ports.patch | 34 ------- ...230-set-me_state-Disabled-in-cmos.default.patch | 38 ++++++++ ...d-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch | 22 ----- ..._state-Disabled-on-all-cmos.default-files.patch | 100 +++++++++++++++++++++ ...x230-set-me_state-Disable-in-cmos.default.patch | 38 -------- .../0013-specifically-use-python3-in-scripts.patch | 36 ++++++++ .../0014-coreboot-default-fix-crossgcc-build.patch | 57 ++++++++++++ ..._state-Disabled-on-all-cmos.default-files.patch | 100 --------------------- .../default/patches/0015-python-patch.patch | 36 -------- 19 files changed, 303 insertions(+), 246 deletions(-) create mode 100644 resources/coreboot/default/patches/0009-lenovo-t400-Enable-all-SATA-ports.patch create mode 100644 resources/coreboot/default/patches/0010-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch delete mode 100644 resources/coreboot/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch create mode 100644 resources/coreboot/default/patches/0011-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch delete mode 100644 resources/coreboot/default/patches/0012-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch create mode 100644 resources/coreboot/default/patches/0012-set-me_state-Disabled-on-all-cmos.default-files.patch delete mode 100644 resources/coreboot/default/patches/0013-lenovo-x230-set-me_state-Disable-in-cmos.default.patch create mode 100644 resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch create mode 100644 resources/coreboot/default/patches/0014-coreboot-default-fix-crossgcc-build.patch delete mode 100644 resources/coreboot/default/patches/0014-set-me_state-Disabled-on-all-cmos.default-files.patch delete mode 100644 resources/coreboot/default/patches/0015-python-patch.patch diff --git a/resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch b/resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch index 74090dc0..d624b14a 100644 --- a/resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch +++ b/resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch @@ -1,7 +1,7 @@ -From 4df63d823092dc06e3cfc27165a4850b996af90d Mon Sep 17 00:00:00 2001 +From 087327fa0513b27be0487a4dd8fbf4c3c783cf12 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 19 Mar 2021 05:54:58 +0000 -Subject: [PATCH 01/11] apple/macbook21: Set default VRAM to 64MiB instead of +Subject: [PATCH 01/14] apple/macbook21: Set default VRAM to 64MiB instead of 8MiB --- diff --git a/resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch b/resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch index 11c26913..3e35bcd1 100644 --- a/resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch +++ b/resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch @@ -1,7 +1,7 @@ -From a43fee19b7a4615aceb9bdf96afda980c106445e Mon Sep 17 00:00:00 2001 +From 7f5cdb1b4677cacc396ac62dd4f62b600d1a324a Mon Sep 17 00:00:00 2001 From: Vitali64 <5405891-vitali64yt@users.noreply.gitlab.com> Date: Wed, 27 Oct 2021 13:36:01 +0200 -Subject: [PATCH 02/11] add c3 and clockgen to apple/macbook21 +Subject: [PATCH 02/14] add c3 and clockgen to apple/macbook21 --- src/mainboard/apple/macbook21/Kconfig | 1 + diff --git a/resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch b/resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch index 08b289d7..0e656f86 100644 --- a/resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch +++ b/resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch @@ -1,7 +1,7 @@ -From 6302d89dfd785330944ad091767c7e7eb8da4aed Mon Sep 17 00:00:00 2001 +From 1582b3d799e43dc44f92d4e043ac2f86cfd1bd86 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 3 Jan 2021 03:34:01 +0000 -Subject: [PATCH 03/11] lenovo/x60: 64MiB Video RAM changed to default +Subject: [PATCH 03/14] lenovo/x60: 64MiB Video RAM changed to default (previously it was 8MiB) --- diff --git a/resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch b/resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch index 67c4a892..c2c90f7e 100644 --- a/resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch +++ b/resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch @@ -1,7 +1,7 @@ -From f13f10f6b61d0581970a508b626cd63adf607eff Mon Sep 17 00:00:00 2001 +From 0fb538599c46a4e7f950c57b67b2d8c0d92200f4 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 22 Feb 2021 22:16:59 +0000 -Subject: [PATCH 04/11] lenovo/t60: make 64MiB VRAM the default in cmos.default +Subject: [PATCH 04/14] lenovo/t60: make 64MiB VRAM the default in cmos.default --- src/mainboard/lenovo/t60/cmos.default | 2 +- diff --git a/resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch b/resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch index d205f2a6..25fed35a 100644 --- a/resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch +++ b/resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch @@ -1,7 +1,7 @@ -From e3b971134ffc2f52e575efe53a571978ed291dc6 Mon Sep 17 00:00:00 2001 +From 702e80f25436126f0b157dff95a90fdbe318c2c5 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 14 May 2021 13:10:33 +0100 -Subject: [PATCH 05/11] lenovo/t400: set VRAM to 352MiB VRAM by default +Subject: [PATCH 05/14] lenovo/t400: set VRAM to 352MiB VRAM by default In the past, this caused stability issues so we set it to 256MiB. Nowadays, coreboot has fixed the issue preventing this. See: diff --git a/resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch b/resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch index 9ff0ad8d..e6c77fbf 100644 --- a/resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch +++ b/resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch @@ -1,7 +1,7 @@ -From 383c273f0c44eec93cd55c3d21d6c1a8316d8dbe Mon Sep 17 00:00:00 2001 +From d9d2e1fceb4abf99e140662a25059c6e913556de Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 14 May 2021 13:11:59 +0100 -Subject: [PATCH 06/11] lenovo/x200: set VRAM to 352MiB by default +Subject: [PATCH 06/14] lenovo/x200: set VRAM to 352MiB by default This fix makes it possible: https://review.coreboot.org/c/coreboot/+/16831 diff --git a/resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch b/resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch index 7992b023..fc0a1f14 100644 --- a/resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch +++ b/resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch @@ -1,7 +1,7 @@ -From 4f4f957ea967cc94841746821144ee807747f540 Mon Sep 17 00:00:00 2001 +From b69a04a9ec173a431507e35e70f150fbd864fde3 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 14 May 2021 13:18:26 +0100 -Subject: [PATCH 07/11] gigabyte/ga-g41m-es2l: set VRAM to 352MiB by default +Subject: [PATCH 07/14] gigabyte/ga-g41m-es2l: set VRAM to 352MiB by default --- src/mainboard/gigabyte/ga-g41m-es2l/cmos.default | 2 +- diff --git a/resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch b/resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch index 1536c15f..3ae8d26e 100644 --- a/resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch +++ b/resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch @@ -1,7 +1,7 @@ -From 1ee893f9fc5251968500695824ab9fd39461d318 Mon Sep 17 00:00:00 2001 +From 5409b84b222f4f04238dcafb7411986692909098 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 14 May 2021 13:21:39 +0100 -Subject: [PATCH 08/11] acer/g43t-am3: set VRAM to 352MiB by default +Subject: [PATCH 08/14] acer/g43t-am3: set VRAM to 352MiB by default --- src/mainboard/acer/g43t-am3/cmos.default | 2 +- diff --git a/resources/coreboot/default/patches/0009-lenovo-t400-Enable-all-SATA-ports.patch b/resources/coreboot/default/patches/0009-lenovo-t400-Enable-all-SATA-ports.patch new file mode 100644 index 00000000..bf41150d --- /dev/null +++ b/resources/coreboot/default/patches/0009-lenovo-t400-Enable-all-SATA-ports.patch @@ -0,0 +1,34 @@ +From 1c3812ccecef2b22379e4999666de95cd7f38acf Mon Sep 17 00:00:00 2001 +From: persmule +Date: Sun, 31 Oct 2021 23:33:26 +0000 +Subject: [PATCH 09/14] lenovo/t400: Enable all SATA ports + +There are 2 SATA ports on the chassis of t400(s), but at least one dock for +t400 contains a port for (P/S)ATA device, and t400s has a eSATA port on its +chassis, and another one on its dock. + +They have to be unmasked via device tree to use. + +This patch unmasked all SATA ports found within t400s with factory firmware. +--- + src/mainboard/lenovo/t400/devicetree.cb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb +index 670b4883f3..1fc60d9b24 100644 +--- a/src/mainboard/lenovo/t400/devicetree.cb ++++ b/src/mainboard/lenovo/t400/devicetree.cb +@@ -59,8 +59,8 @@ chip northbridge/intel/gm45 + register "gpe0_en" = "0x01000000" + register "gpi1_routing" = "2" + +- # Set AHCI mode, enable ports 1 and 2. +- register "sata_port_map" = "0x03" ++ # Set AHCI mode, enable ports 1, 2, 5 and 6. ++ register "sata_port_map" = "0x33" + register "sata_clock_request" = "0" + register "sata_traffic_monitor" = "0" + +-- +2.25.1 + diff --git a/resources/coreboot/default/patches/0010-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch b/resources/coreboot/default/patches/0010-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch new file mode 100644 index 00000000..74039e5f --- /dev/null +++ b/resources/coreboot/default/patches/0010-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch @@ -0,0 +1,22 @@ +From d35656413f27f37b0d7680f6ed0a2b1aac31b982 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Mon, 20 Dec 2021 01:29:31 +0000 +Subject: [PATCH 10/14] coreboot: Add 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/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch b/resources/coreboot/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch deleted file mode 100644 index dec2844e..00000000 --- a/resources/coreboot/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c4ab3bd4c88d83ca3ca391519cec31fa7b7a6c2a Mon Sep 17 00:00:00 2001 -From: persmule -Date: Sun, 31 Oct 2021 23:33:26 +0000 -Subject: [PATCH 11/11] lenovo/t400: Enable all SATA ports - -There are 2 SATA ports on the chassis of t400(s), but at least one dock for -t400 contains a port for (P/S)ATA device, and t400s has a eSATA port on its -chassis, and another one on its dock. - -They have to be unmasked via device tree to use. - -This patch unmasked all SATA ports found within t400s with factory firmware. ---- - src/mainboard/lenovo/t400/devicetree.cb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb -index 670b4883f3..1fc60d9b24 100644 ---- a/src/mainboard/lenovo/t400/devicetree.cb -+++ b/src/mainboard/lenovo/t400/devicetree.cb -@@ -59,8 +59,8 @@ chip northbridge/intel/gm45 - register "gpe0_en" = "0x01000000" - register "gpi1_routing" = "2" - -- # Set AHCI mode, enable ports 1 and 2. -- register "sata_port_map" = "0x03" -+ # Set AHCI mode, enable ports 1, 2, 5 and 6. -+ register "sata_port_map" = "0x33" - register "sata_clock_request" = "0" - register "sata_traffic_monitor" = "0" - --- -2.25.1 - diff --git a/resources/coreboot/default/patches/0011-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch b/resources/coreboot/default/patches/0011-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch new file mode 100644 index 00000000..4b0fea93 --- /dev/null +++ b/resources/coreboot/default/patches/0011-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch @@ -0,0 +1,38 @@ +From 0f2cd8edad3326a8c9f3b785efbda395d1c8cde9 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Mon, 3 Jan 2022 19:06:22 +0000 +Subject: [PATCH 11/14] 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/default/patches/0012-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch b/resources/coreboot/default/patches/0012-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch deleted file mode 100644 index 7c692263..00000000 --- a/resources/coreboot/default/patches/0012-coreboot-Add-Lenovo-X230-patch-gfx_uma_size-224M-by-.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6a8bf6d6a52081c06baab2b49ea571f04d4d6e5d Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Mon, 20 Dec 2021 01:29:31 +0000 -Subject: [PATCH 1/1] coreboot: Add 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/default/patches/0012-set-me_state-Disabled-on-all-cmos.default-files.patch b/resources/coreboot/default/patches/0012-set-me_state-Disabled-on-all-cmos.default-files.patch new file mode 100644 index 00000000..269faf76 --- /dev/null +++ b/resources/coreboot/default/patches/0012-set-me_state-Disabled-on-all-cmos.default-files.patch @@ -0,0 +1,100 @@ +From 694fac8e25949c20de421ee1b199a16b94c202e5 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Wed, 2 Mar 2022 21:50:01 +0000 +Subject: [PATCH 12/14] set me_state=Disabled on all cmos.default files! + +yeah. why the hell isn't this the default +--- + src/mainboard/lenovo/l520/cmos.default | 2 +- + src/mainboard/lenovo/t420/cmos.default | 2 +- + src/mainboard/lenovo/t420s/cmos.default | 2 +- + src/mainboard/lenovo/t430/cmos.default | 2 +- + src/mainboard/lenovo/t430s/cmos.default | 2 +- + src/mainboard/lenovo/t520/cmos.default | 2 +- + src/mainboard/lenovo/t530/cmos.default | 2 +- + src/mainboard/lenovo/x220/cmos.default | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/mainboard/lenovo/l520/cmos.default b/src/mainboard/lenovo/l520/cmos.default +index 681c40e78b..57cdcf9162 100644 +--- a/src/mainboard/lenovo/l520/cmos.default ++++ b/src/mainboard/lenovo/l520/cmos.default +@@ -14,4 +14,4 @@ sticky_fn=Disable + trackpoint=Enable + backlight=Both + usb_always_on=Disable +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/t420/cmos.default b/src/mainboard/lenovo/t420/cmos.default +index 8244071b8a..c011867916 100644 +--- a/src/mainboard/lenovo/t420/cmos.default ++++ b/src/mainboard/lenovo/t420/cmos.default +@@ -14,4 +14,4 @@ sticky_fn=Disable + trackpoint=Enable + hybrid_graphics_mode=Integrated Only + usb_always_on=Disable +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/t420s/cmos.default b/src/mainboard/lenovo/t420s/cmos.default +index 8244071b8a..c011867916 100644 +--- a/src/mainboard/lenovo/t420s/cmos.default ++++ b/src/mainboard/lenovo/t420s/cmos.default +@@ -14,4 +14,4 @@ sticky_fn=Disable + trackpoint=Enable + hybrid_graphics_mode=Integrated Only + usb_always_on=Disable +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/t430/cmos.default b/src/mainboard/lenovo/t430/cmos.default +index 26795fe5cf..55e1e6c04e 100644 +--- a/src/mainboard/lenovo/t430/cmos.default ++++ b/src/mainboard/lenovo/t430/cmos.default +@@ -15,4 +15,4 @@ trackpoint=Enable + backlight=Both + usb_always_on=Disable + hybrid_graphics_mode=Integrated Only +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/t430s/cmos.default b/src/mainboard/lenovo/t430s/cmos.default +index 52dbf70377..b16800ca9e 100644 +--- a/src/mainboard/lenovo/t430s/cmos.default ++++ b/src/mainboard/lenovo/t430s/cmos.default +@@ -16,4 +16,4 @@ backlight=Both + enable_dual_graphics=Disable + usb_always_on=Disable + f1_to_f12_as_primary=Enable +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/t520/cmos.default b/src/mainboard/lenovo/t520/cmos.default +index cf79b391e2..b66f7034dc 100644 +--- a/src/mainboard/lenovo/t520/cmos.default ++++ b/src/mainboard/lenovo/t520/cmos.default +@@ -15,4 +15,4 @@ trackpoint=Enable + backlight=Both + hybrid_graphics_mode=Integrated Only + usb_always_on=Disable +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/t530/cmos.default b/src/mainboard/lenovo/t530/cmos.default +index cf79b391e2..b66f7034dc 100644 +--- a/src/mainboard/lenovo/t530/cmos.default ++++ b/src/mainboard/lenovo/t530/cmos.default +@@ -15,4 +15,4 @@ trackpoint=Enable + backlight=Both + hybrid_graphics_mode=Integrated Only + usb_always_on=Disable +-me_state=Normal ++me_state=Disabled +diff --git a/src/mainboard/lenovo/x220/cmos.default b/src/mainboard/lenovo/x220/cmos.default +index 6d1d57a795..52f303dfdb 100644 +--- a/src/mainboard/lenovo/x220/cmos.default ++++ b/src/mainboard/lenovo/x220/cmos.default +@@ -13,4 +13,4 @@ usb_always_on=Disable + fn_ctrl_swap=Disable + sticky_fn=Disable + trackpoint=Enable +-me_state=Normal ++me_state=Disabled +-- +2.25.1 + diff --git a/resources/coreboot/default/patches/0013-lenovo-x230-set-me_state-Disable-in-cmos.default.patch b/resources/coreboot/default/patches/0013-lenovo-x230-set-me_state-Disable-in-cmos.default.patch deleted file mode 100644 index 300a9908..00000000 --- a/resources/coreboot/default/patches/0013-lenovo-x230-set-me_state-Disable-in-cmos.default.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 146a4d6454e72da4a9204cb4c48c4994ba4cdd8d Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Mon, 3 Jan 2022 19:06:22 +0000 -Subject: [PATCH 1/1] 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/default/patches/0013-specifically-use-python3-in-scripts.patch b/resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch new file mode 100644 index 00000000..2e5f53dc --- /dev/null +++ b/resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch @@ -0,0 +1,36 @@ +From 4106d0163987ae926a7f4261dec06e3e8bf85ff0 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sun, 13 Mar 2022 18:04:55 +0000 +Subject: [PATCH 13/14] 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 eaf99d1492..9e82172c9e 100644 +--- a/src/drivers/intel/fsp2_0/Makefile.inc ++++ b/src/drivers/intel/fsp2_0/Makefile.inc +@@ -84,7 +84,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/default/patches/0014-coreboot-default-fix-crossgcc-build.patch b/resources/coreboot/default/patches/0014-coreboot-default-fix-crossgcc-build.patch new file mode 100644 index 00000000..b99a912d --- /dev/null +++ b/resources/coreboot/default/patches/0014-coreboot-default-fix-crossgcc-build.patch @@ -0,0 +1,57 @@ +From 9837b542ee2ff56032950b211e60e1e180343f44 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sat, 19 Nov 2022 03:30:34 +0000 +Subject: [PATCH 14/14] coreboot/default: fix crossgcc build + +patch copied from +coreboot f9b5665d280faa35c6b41fe0c48a9e9e1afd634b +--- + 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/default/patches/0014-set-me_state-Disabled-on-all-cmos.default-files.patch b/resources/coreboot/default/patches/0014-set-me_state-Disabled-on-all-cmos.default-files.patch deleted file mode 100644 index f91baf57..00000000 --- a/resources/coreboot/default/patches/0014-set-me_state-Disabled-on-all-cmos.default-files.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 75a44087be5da44b95133906b2213d7f234e7d0e Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Wed, 2 Mar 2022 21:50:01 +0000 -Subject: [PATCH 1/1] set me_state=Disabled on all cmos.default files! - -yeah. why the hell isn't this the default ---- - src/mainboard/lenovo/l520/cmos.default | 2 +- - src/mainboard/lenovo/t420/cmos.default | 2 +- - src/mainboard/lenovo/t420s/cmos.default | 2 +- - src/mainboard/lenovo/t430/cmos.default | 2 +- - src/mainboard/lenovo/t430s/cmos.default | 2 +- - src/mainboard/lenovo/t520/cmos.default | 2 +- - src/mainboard/lenovo/t530/cmos.default | 2 +- - src/mainboard/lenovo/x220/cmos.default | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/mainboard/lenovo/l520/cmos.default b/src/mainboard/lenovo/l520/cmos.default -index 681c40e78b..57cdcf9162 100644 ---- a/src/mainboard/lenovo/l520/cmos.default -+++ b/src/mainboard/lenovo/l520/cmos.default -@@ -14,4 +14,4 @@ sticky_fn=Disable - trackpoint=Enable - backlight=Both - usb_always_on=Disable --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/t420/cmos.default b/src/mainboard/lenovo/t420/cmos.default -index 8244071b8a..c011867916 100644 ---- a/src/mainboard/lenovo/t420/cmos.default -+++ b/src/mainboard/lenovo/t420/cmos.default -@@ -14,4 +14,4 @@ sticky_fn=Disable - trackpoint=Enable - hybrid_graphics_mode=Integrated Only - usb_always_on=Disable --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/t420s/cmos.default b/src/mainboard/lenovo/t420s/cmos.default -index 8244071b8a..c011867916 100644 ---- a/src/mainboard/lenovo/t420s/cmos.default -+++ b/src/mainboard/lenovo/t420s/cmos.default -@@ -14,4 +14,4 @@ sticky_fn=Disable - trackpoint=Enable - hybrid_graphics_mode=Integrated Only - usb_always_on=Disable --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/t430/cmos.default b/src/mainboard/lenovo/t430/cmos.default -index 26795fe5cf..55e1e6c04e 100644 ---- a/src/mainboard/lenovo/t430/cmos.default -+++ b/src/mainboard/lenovo/t430/cmos.default -@@ -15,4 +15,4 @@ trackpoint=Enable - backlight=Both - usb_always_on=Disable - hybrid_graphics_mode=Integrated Only --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/t430s/cmos.default b/src/mainboard/lenovo/t430s/cmos.default -index 52dbf70377..b16800ca9e 100644 ---- a/src/mainboard/lenovo/t430s/cmos.default -+++ b/src/mainboard/lenovo/t430s/cmos.default -@@ -16,4 +16,4 @@ backlight=Both - enable_dual_graphics=Disable - usb_always_on=Disable - f1_to_f12_as_primary=Enable --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/t520/cmos.default b/src/mainboard/lenovo/t520/cmos.default -index cf79b391e2..b66f7034dc 100644 ---- a/src/mainboard/lenovo/t520/cmos.default -+++ b/src/mainboard/lenovo/t520/cmos.default -@@ -15,4 +15,4 @@ trackpoint=Enable - backlight=Both - hybrid_graphics_mode=Integrated Only - usb_always_on=Disable --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/t530/cmos.default b/src/mainboard/lenovo/t530/cmos.default -index cf79b391e2..b66f7034dc 100644 ---- a/src/mainboard/lenovo/t530/cmos.default -+++ b/src/mainboard/lenovo/t530/cmos.default -@@ -15,4 +15,4 @@ trackpoint=Enable - backlight=Both - hybrid_graphics_mode=Integrated Only - usb_always_on=Disable --me_state=Normal -+me_state=Disabled -diff --git a/src/mainboard/lenovo/x220/cmos.default b/src/mainboard/lenovo/x220/cmos.default -index 6d1d57a795..52f303dfdb 100644 ---- a/src/mainboard/lenovo/x220/cmos.default -+++ b/src/mainboard/lenovo/x220/cmos.default -@@ -13,4 +13,4 @@ usb_always_on=Disable - fn_ctrl_swap=Disable - sticky_fn=Disable - trackpoint=Enable --me_state=Normal -+me_state=Disabled --- -2.25.1 - diff --git a/resources/coreboot/default/patches/0015-python-patch.patch b/resources/coreboot/default/patches/0015-python-patch.patch deleted file mode 100644 index 0f2abc14..00000000 --- a/resources/coreboot/default/patches/0015-python-patch.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cb3b04a3849952d8c0fa90616f45cfe5e613a286 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 13 Mar 2022 18:04:55 +0000 -Subject: [PATCH 1/1] 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 eaf99d1492..9e82172c9e 100644 ---- a/src/drivers/intel/fsp2_0/Makefile.inc -+++ b/src/drivers/intel/fsp2_0/Makefile.inc -@@ -84,7 +84,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 - -- cgit v1.2.1