From 0d53e8a3854b1de911a3b4f70d7fa0f9fb4a8962 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Fri, 14 Feb 2025 12:11:57 -0500 Subject: [PATCH] rename coreboot-2412 to coreboot-24.12 for versioning consistency, move patches, point board configs to version change Signed-off-by: Thierry Laurion --- boards/t480-hotp-maximized/t480-hotp-maximized.config | 2 +- boards/t480-maximized/t480-maximized.config | 2 +- modules/coreboot | 6 +++--- .../0001-soc-intel-skylake-configure-usb-acpi.patch | 0 ...c-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch | 0 ...003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch | 0 ...9-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch | 0 ...-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch | 0 .../0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch | 0 ...c-intel-skylake-Disable-stack-overflow-debug-optio.patch | 0 .../0014-src-intel-x4x-Disable-stack-overflow-debug.patch | 0 .../85278-post-skylake-pr0.patch | 0 12 files changed, 5 insertions(+), 5 deletions(-) rename patches/{coreboot-2412 => coreboot-24.12}/0001-soc-intel-skylake-configure-usb-acpi.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/0014-src-intel-x4x-Disable-stack-overflow-debug.patch (100%) rename patches/{coreboot-2412 => coreboot-24.12}/85278-post-skylake-pr0.patch (100%) diff --git a/boards/t480-hotp-maximized/t480-hotp-maximized.config b/boards/t480-hotp-maximized/t480-hotp-maximized.config index 1dcf97b8..9e4d4ddb 100644 --- a/boards/t480-hotp-maximized/t480-hotp-maximized.config +++ b/boards/t480-hotp-maximized/t480-hotp-maximized.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=2412 +export CONFIG_COREBOOT_VERSION=24.12 export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-t480-maximized.config diff --git a/boards/t480-maximized/t480-maximized.config b/boards/t480-maximized/t480-maximized.config index ee20f0c4..4082cdf0 100644 --- a/boards/t480-maximized/t480-maximized.config +++ b/boards/t480-maximized/t480-maximized.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=2412 +export CONFIG_COREBOOT_VERSION=24.12 export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-t480-maximized.config diff --git a/modules/coreboot b/modules/coreboot index 5a022ed4..1ff9b649 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -104,10 +104,10 @@ $(eval $(call coreboot_module,dasharo,24.02.01)) # 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 +coreboot-24.12_repo := https://review.coreboot.org/coreboot.git +coreboot-24.12_commit_hash := 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a #Don't reuse any coreboot buildstack for now since nothing else is based on 24.12 -$(eval $(call coreboot_module,2412,)) +$(eval $(call coreboot_module,24.12,)) # Check that the board configured the coreboot version correctly ifeq "$(CONFIG_COREBOOT_VERSION)" "" diff --git a/patches/coreboot-2412/0001-soc-intel-skylake-configure-usb-acpi.patch b/patches/coreboot-24.12/0001-soc-intel-skylake-configure-usb-acpi.patch similarity index 100% rename from patches/coreboot-2412/0001-soc-intel-skylake-configure-usb-acpi.patch rename to patches/coreboot-24.12/0001-soc-intel-skylake-configure-usb-acpi.patch diff --git a/patches/coreboot-2412/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch b/patches/coreboot-24.12/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch similarity index 100% rename from patches/coreboot-2412/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch rename to patches/coreboot-24.12/0002-soc-intel-skylake-Enable-4E-4F-PNP-I-O-ports-in-boot.patch diff --git a/patches/coreboot-2412/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch b/patches/coreboot-24.12/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch similarity index 100% rename from patches/coreboot-2412/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch rename to patches/coreboot-24.12/0003-mb-lenovo-Add-ThinkPad-T480-and-ThinkPad-T480s.patch diff --git a/patches/coreboot-2412/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch b/patches/coreboot-24.12/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch similarity index 100% rename from patches/coreboot-2412/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch rename to patches/coreboot-24.12/0009-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch diff --git a/patches/coreboot-2412/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch b/patches/coreboot-24.12/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch similarity index 100% rename from patches/coreboot-2412/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch rename to patches/coreboot-24.12/0011-soc-intel-pmc-Hardcoded-poweroff-after-power-fail.patch diff --git a/patches/coreboot-2412/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch b/patches/coreboot-24.12/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch similarity index 100% rename from patches/coreboot-2412/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch rename to patches/coreboot-24.12/0012-ec-dasharo-Comment-EC_DASHARO_EC_FLASH_SIZE.patch diff --git a/patches/coreboot-2412/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch b/patches/coreboot-24.12/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch similarity index 100% rename from patches/coreboot-2412/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch rename to patches/coreboot-24.12/0013-src-intel-skylake-Disable-stack-overflow-debug-optio.patch diff --git a/patches/coreboot-2412/0014-src-intel-x4x-Disable-stack-overflow-debug.patch b/patches/coreboot-24.12/0014-src-intel-x4x-Disable-stack-overflow-debug.patch similarity index 100% rename from patches/coreboot-2412/0014-src-intel-x4x-Disable-stack-overflow-debug.patch rename to patches/coreboot-24.12/0014-src-intel-x4x-Disable-stack-overflow-debug.patch diff --git a/patches/coreboot-2412/85278-post-skylake-pr0.patch b/patches/coreboot-24.12/85278-post-skylake-pr0.patch similarity index 100% rename from patches/coreboot-2412/85278-post-skylake-pr0.patch rename to patches/coreboot-24.12/85278-post-skylake-pr0.patch