From aff8e13a902a753e1053c87d8125067bcc7f7717 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Wed, 12 Feb 2025 13:33:15 -0500 Subject: [PATCH] targets/t480_me_blobs.mk: remove leftover artifact of @notgivenby from cleaner merged/adapted work from @gaspar-ilom Signed-off-by: Thierry Laurion --- boards/t480-hotp/t480-hotp.config | 2 +- boards/t480/t480.config | 2 +- modules/coreboot | 13 +++++++++---- ...001-soc-intel-skylake-configure-usb-acpi.patch | 0 ...ylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch | 0 ...ovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch | 0 ...04-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch | 0 ...ifdtool-add-nuke-flag-all-0xFF-on-region.patch | 0 ...ng-for-coreboot-images-built-without-a-p.patch | 0 ...07-mb-dell-optiplex_780-Add-USFF-variant.patch | 0 ...0008-dell-3050micro-disable-nvme-hotplug.patch | 0 ...dd-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch | 0 ...0-soc-intel-skylake-Don-t-compress-FSP-S.patch | 0 ...-pmc-Hardcoded-poweroff-after-power-fail.patch | 0 ...dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch | 0 ...ylake-Disable-stack-overflow-debug-optio.patch | 0 ...c-intel-x4x-Disable-stack-overflow-debug.patch | 0 .../85278-post-skylake-pr0.patch | 0 targets/t480_me_blobs.mk | 15 --------------- 19 files changed, 11 insertions(+), 21 deletions(-) rename patches/{coreboot-t480 => coreboot-2412}/0001-soc-intel-skylake-configure-usb-acpi.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0004-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0006-Remove-warning-for-coreboot-images-built-without-a-p.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0007-mb-dell-optiplex_780-Add-USFF-variant.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0008-dell-3050micro-disable-nvme-hotplug.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0010-soc-intel-skylake-Don-t-compress-FSP-S.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/0014-src-intel-x4x-Disable-stack-overflow-debug.patch (100%) rename patches/{coreboot-t480 => coreboot-2412}/85278-post-skylake-pr0.patch (100%) delete mode 100644 targets/t480_me_blobs.mk diff --git a/boards/t480-hotp/t480-hotp.config b/boards/t480-hotp/t480-hotp.config index f5db69db..7da65f1d 100644 --- a/boards/t480-hotp/t480-hotp.config +++ b/boards/t480-hotp/t480-hotp.config @@ -8,7 +8,7 @@ # - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code) export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=t480 +export CONFIG_COREBOOT_VERSION=2412 export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-t480.config diff --git a/boards/t480/t480.config b/boards/t480/t480.config index acc82788..0d87ec97 100644 --- a/boards/t480/t480.config +++ b/boards/t480/t480.config @@ -8,7 +8,7 @@ # - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code) export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=t480 +export CONFIG_COREBOOT_VERSION=2412 export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-t480.config diff --git a/modules/coreboot b/modules/coreboot index be27e9c9..5a022ed4 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -98,11 +98,16 @@ coreboot-dasharo_commit_hash := 94e5f5d5b808cf8d8fd5c70d4ef6a08a054f8986 $(eval $(call coreboot_module,dasharo,24.02.01)) #coreboot-dasharo_patch_version := unreleased -# T480 is based on coreboot ~24.12 release (TODO: verify) -coreboot-t480_repo := https://review.coreboot.org/coreboot.git -coreboot-t480_commit_hash := 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a +# T480 is based on coreboot ~24.12 release +# coreboot 24.12 doesn't include t480 support which is still under review at https://review.coreboot.org/c/coreboot/+/83274 +# TODO: track upstream WiP and switch to later upstream release containing patchset without relaying on libreboot downstream maintained patchset +# Therefore, patches/coreboot-2412 includes libreboot patches applied to 24.12 release +# patches/coreboot-2412 also includes PR0 patchset, minus xeon support which don't apply to 24.12 as per https://review.coreboot.org/c/coreboot/+/85278 +# TODO: @miczyg1 rebase of patchset so that doenstream don't have to maintain, adapt work +coreboot-2412_repo := https://review.coreboot.org/coreboot.git +coreboot-2412_commit_hash := 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a #Don't reuse any coreboot buildstack for now since nothing else is based on 24.12 -$(eval $(call coreboot_module,t480,)) +$(eval $(call coreboot_module,2412,)) # Check that the board configured the coreboot version correctly ifeq "$(CONFIG_COREBOOT_VERSION)" "" diff --git a/patches/coreboot-t480/0001-soc-intel-skylake-configure-usb-acpi.patch b/patches/coreboot-2412/0001-soc-intel-skylake-configure-usb-acpi.patch similarity index 100% rename from patches/coreboot-t480/0001-soc-intel-skylake-configure-usb-acpi.patch rename to patches/coreboot-2412/0001-soc-intel-skylake-configure-usb-acpi.patch diff --git a/patches/coreboot-t480/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch b/patches/coreboot-2412/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch similarity index 100% rename from patches/coreboot-t480/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch rename to patches/coreboot-2412/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch diff --git a/patches/coreboot-t480/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch b/patches/coreboot-2412/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch similarity index 100% rename from patches/coreboot-t480/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch rename to patches/coreboot-2412/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch diff --git a/patches/coreboot-t480/0004-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch b/patches/coreboot-2412/0004-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch similarity index 100% rename from patches/coreboot-t480/0004-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch rename to patches/coreboot-2412/0004-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch diff --git a/patches/coreboot-t480/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch b/patches/coreboot-2412/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch similarity index 100% rename from patches/coreboot-t480/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch rename to patches/coreboot-2412/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch diff --git a/patches/coreboot-t480/0006-Remove-warning-for-coreboot-images-built-without-a-p.patch b/patches/coreboot-2412/0006-Remove-warning-for-coreboot-images-built-without-a-p.patch similarity index 100% rename from patches/coreboot-t480/0006-Remove-warning-for-coreboot-images-built-without-a-p.patch rename to patches/coreboot-2412/0006-Remove-warning-for-coreboot-images-built-without-a-p.patch diff --git a/patches/coreboot-t480/0007-mb-dell-optiplex_780-Add-USFF-variant.patch b/patches/coreboot-2412/0007-mb-dell-optiplex_780-Add-USFF-variant.patch similarity index 100% rename from patches/coreboot-t480/0007-mb-dell-optiplex_780-Add-USFF-variant.patch rename to patches/coreboot-2412/0007-mb-dell-optiplex_780-Add-USFF-variant.patch diff --git a/patches/coreboot-t480/0008-dell-3050micro-disable-nvme-hotplug.patch b/patches/coreboot-2412/0008-dell-3050micro-disable-nvme-hotplug.patch similarity index 100% rename from patches/coreboot-t480/0008-dell-3050micro-disable-nvme-hotplug.patch rename to patches/coreboot-2412/0008-dell-3050micro-disable-nvme-hotplug.patch diff --git a/patches/coreboot-t480/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch b/patches/coreboot-2412/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch similarity index 100% rename from patches/coreboot-t480/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch rename to patches/coreboot-2412/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch diff --git a/patches/coreboot-t480/0010-soc-intel-skylake-Don-t-compress-FSP-S.patch b/patches/coreboot-2412/0010-soc-intel-skylake-Don-t-compress-FSP-S.patch similarity index 100% rename from patches/coreboot-t480/0010-soc-intel-skylake-Don-t-compress-FSP-S.patch rename to patches/coreboot-2412/0010-soc-intel-skylake-Don-t-compress-FSP-S.patch diff --git a/patches/coreboot-t480/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch b/patches/coreboot-2412/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch similarity index 100% rename from patches/coreboot-t480/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch rename to patches/coreboot-2412/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch diff --git a/patches/coreboot-t480/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch b/patches/coreboot-2412/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch similarity index 100% rename from patches/coreboot-t480/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch rename to patches/coreboot-2412/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch diff --git a/patches/coreboot-t480/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch b/patches/coreboot-2412/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch similarity index 100% rename from patches/coreboot-t480/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch rename to patches/coreboot-2412/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch diff --git a/patches/coreboot-t480/0014-src-intel-x4x-Disable-stack-overflow-debug.patch b/patches/coreboot-2412/0014-src-intel-x4x-Disable-stack-overflow-debug.patch similarity index 100% rename from patches/coreboot-t480/0014-src-intel-x4x-Disable-stack-overflow-debug.patch rename to patches/coreboot-2412/0014-src-intel-x4x-Disable-stack-overflow-debug.patch diff --git a/patches/coreboot-t480/85278-post-skylake-pr0.patch b/patches/coreboot-2412/85278-post-skylake-pr0.patch similarity index 100% rename from patches/coreboot-t480/85278-post-skylake-pr0.patch rename to patches/coreboot-2412/85278-post-skylake-pr0.patch diff --git a/targets/t480_me_blobs.mk b/targets/t480_me_blobs.mk deleted file mode 100644 index 5802fa3b..00000000 --- a/targets/t480_me_blobs.mk +++ /dev/null @@ -1,15 +0,0 @@ -# TODO describe the process for t480 -#Targets for downloading t480 ME blob, cleaning and deguarding. - -# t480-*-maximized boards require you to initially call -# - blobs/t480/download-clean-deguard-me.sh -# To download donor's Dells-Inspiron.exe, extract ME binary with biosutilities from libreboot, clean ME, -# and deguard it using Mate Kukri deguard tool. - -# Make the Coreboot build depend on the following 3rd party blobs: -$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \ - $(pwd)/blobs/t480/me.bin - -$(pwd)/blobs/t480/me.bin: - COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \ - $(pwd)/blobs/t480/download-clean-deguard-me.sh $(pwd)/blobs/t480