From 5a641b071d944fcf022702cb2822c143c3da9059 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 6 Nov 2024 22:28:45 +0000 Subject: [PATCH] Bump coreboot/next in line with lbmk This version simply updates the revision, whereas the corresponding lbmk patch was more invasive: commit 9abddb82b9228be738382ddc178a9562926404b3 Author: Leah Rowe Date: Wed Nov 6 22:28:45 2024 +0000 Bump coreboot/next and merge coreboot/dell7 Canoeboot must be in sync with Libreboot at all times. Well, the Libreboot patch also merges another tree that Canoeboot doesn't have, containing the Dell OptiPlex 3050 Micro port, because Canoeboot can't support the OptiPlek 3050 Micro. So the Libreboot patch rebased many patches. This one simply updates the revision. Signed-off-by: Leah Rowe --- .../patches/0001-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch | 2 +- ...2-Remove-warning-for-coreboot-images-built-without-a-p.patch | 2 +- .../patches/0003-mb-dell-optiplex_780-Add-USFF-variant.patch | 2 +- .../0004-never-enable-cpu-microcode-even-if-told-to.patch | 2 +- .../patches/0005-Never-download-blobs-even-if-USE_BLOBS-y.patch | 2 +- ...6-fix-speedstep-on-x200-t400-Revert-cpu-intel-model_10.patch | 2 +- .../0007-GM45-type-CPUs-don-t-enable-alternative-SMRR.patch | 2 +- config/coreboot/next/target.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/coreboot/next/patches/0001-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch b/config/coreboot/next/patches/0001-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch index e75f8fb..874608a 100644 --- a/config/coreboot/next/patches/0001-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch +++ b/config/coreboot/next/patches/0001-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch @@ -1,4 +1,4 @@ -From 8761e8ff502e7df30ce7f5950e227c4aa3119c44 Mon Sep 17 00:00:00 2001 +From 31930ffda0b9ac93600122cc6931491ccdcfbe42 Mon Sep 17 00:00:00 2001 From: Nicholas Chin Date: Mon, 30 Sep 2024 20:44:38 -0400 Subject: [PATCH 1/7] mb/dell: Add Optiplex 780 MT (x4x/ICH10) diff --git a/config/coreboot/next/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch b/config/coreboot/next/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch index d0c02e9..7825c3e 100644 --- a/config/coreboot/next/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch +++ b/config/coreboot/next/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch @@ -1,4 +1,4 @@ -From bfe4ae1951bf43f3f4a8512c16bbc10a55397461 Mon Sep 17 00:00:00 2001 +From 9bf803206c27f52503b4c9e4424c79c7218ced32 Mon Sep 17 00:00:00 2001 From: Nicholas Chin Date: Fri, 12 May 2023 19:55:15 -0600 Subject: [PATCH 2/7] Remove warning for coreboot images built without a diff --git a/config/coreboot/next/patches/0003-mb-dell-optiplex_780-Add-USFF-variant.patch b/config/coreboot/next/patches/0003-mb-dell-optiplex_780-Add-USFF-variant.patch index 3f8c4dc..c762b08 100644 --- a/config/coreboot/next/patches/0003-mb-dell-optiplex_780-Add-USFF-variant.patch +++ b/config/coreboot/next/patches/0003-mb-dell-optiplex_780-Add-USFF-variant.patch @@ -1,4 +1,4 @@ -From 173989476c90e3d15c0f5f7e669b16bc496349aa Mon Sep 17 00:00:00 2001 +From f4f8c47e69db783d270ca6c776bc49a3c5ce4489 Mon Sep 17 00:00:00 2001 From: Nicholas Chin Date: Wed, 30 Oct 2024 20:55:25 -0600 Subject: [PATCH 3/7] mb/dell/optiplex_780: Add USFF variant diff --git a/config/coreboot/next/patches/0004-never-enable-cpu-microcode-even-if-told-to.patch b/config/coreboot/next/patches/0004-never-enable-cpu-microcode-even-if-told-to.patch index 0693756..43ec71a 100644 --- a/config/coreboot/next/patches/0004-never-enable-cpu-microcode-even-if-told-to.patch +++ b/config/coreboot/next/patches/0004-never-enable-cpu-microcode-even-if-told-to.patch @@ -1,4 +1,4 @@ -From 268e6e585e38493fcb772b4bea967023fdaca413 Mon Sep 17 00:00:00 2001 +From 6c9b5421abc3f7a34693a90964360b3807d483c3 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 12 Oct 2023 01:20:23 +0100 Subject: [PATCH 4/7] never enable cpu microcode, even if told to diff --git a/config/coreboot/next/patches/0005-Never-download-blobs-even-if-USE_BLOBS-y.patch b/config/coreboot/next/patches/0005-Never-download-blobs-even-if-USE_BLOBS-y.patch index 3a92bf7..03df54e 100644 --- a/config/coreboot/next/patches/0005-Never-download-blobs-even-if-USE_BLOBS-y.patch +++ b/config/coreboot/next/patches/0005-Never-download-blobs-even-if-USE_BLOBS-y.patch @@ -1,4 +1,4 @@ -From ff1c1618fbdca6d53aa348c5970069ba1bae1de6 Mon Sep 17 00:00:00 2001 +From ec2357e3cb95a5ec7300ec421af4680b9272fa4f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 3 May 2024 06:24:49 +0100 Subject: [PATCH 5/7] Never download blobs, even if USE_BLOBS=y diff --git a/config/coreboot/next/patches/0006-fix-speedstep-on-x200-t400-Revert-cpu-intel-model_10.patch b/config/coreboot/next/patches/0006-fix-speedstep-on-x200-t400-Revert-cpu-intel-model_10.patch index 72334bf..5f93e35 100644 --- a/config/coreboot/next/patches/0006-fix-speedstep-on-x200-t400-Revert-cpu-intel-model_10.patch +++ b/config/coreboot/next/patches/0006-fix-speedstep-on-x200-t400-Revert-cpu-intel-model_10.patch @@ -1,4 +1,4 @@ -From eabfef6cdd2d10e8c5097839fb24a65d8ffedaed Mon Sep 17 00:00:00 2001 +From 9fc60e34ed05ebbcafc1bcd9370a80701dedf716 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 1 Dec 2021 02:53:00 +0000 Subject: [PATCH 6/7] fix speedstep on x200/t400: Revert diff --git a/config/coreboot/next/patches/0007-GM45-type-CPUs-don-t-enable-alternative-SMRR.patch b/config/coreboot/next/patches/0007-GM45-type-CPUs-don-t-enable-alternative-SMRR.patch index b16e0dc..f4817a9 100644 --- a/config/coreboot/next/patches/0007-GM45-type-CPUs-don-t-enable-alternative-SMRR.patch +++ b/config/coreboot/next/patches/0007-GM45-type-CPUs-don-t-enable-alternative-SMRR.patch @@ -1,4 +1,4 @@ -From 015cb964c94d46a2d06bf3add34031e2be40b260 Mon Sep 17 00:00:00 2001 +From ba08e8459f527d9ab740344e0f4f50d1e2762359 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 17 Apr 2023 15:49:57 +0100 Subject: [PATCH 7/7] GM45-type CPUs: don't enable alternative SMRR diff --git a/config/coreboot/next/target.cfg b/config/coreboot/next/target.cfg index f8f6d07..8004409 100644 --- a/config/coreboot/next/target.cfg +++ b/config/coreboot/next/target.cfg @@ -1,2 +1,2 @@ tree="next" -rev="c21bed6de9359111afd5d6ed6e76b1d2116b216c" +rev="d28fedf4f2cb7e4475a6cdfcab37d64cc60bba1f"