From b98492377c56a1984ccc44a20ae86f19715fb920 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 10 Dec 2024 19:24:56 -0500 Subject: [PATCH] v560tu/v540tu board configs: adapt FLASH_OPTIONS to not overwrite GBE region, document S3/S01x/Hibernation limitation which is lackking from https://github.com/linuxboot/heads/pull/1846 Signed-off-by: Thierry Laurion --- boards/novacustom-v540tu/novacustom-v540tu.config | 7 ++++++- boards/novacustom-v560tu/novacustom-v560tu.config | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/boards/novacustom-v540tu/novacustom-v540tu.config b/boards/novacustom-v540tu/novacustom-v540tu.config index 54a72ad0..c95d0586 100644 --- a/boards/novacustom-v540tu/novacustom-v540tu.config +++ b/boards/novacustom-v540tu/novacustom-v540tu.config @@ -1,4 +1,9 @@ # NovaCustom V54 MTL (integrated graphics) board configuration +# Note the FLASH_OPTIONS: '--ifd -i bios -i me -i fd' +# This excludes gbe from internal flashing, otherwise mac address would revert to '88:88:88:88:87:88' see https://github.com/linuxboot/heads/pull/1871#discussion_r1870134788 +# Same options should be used when externally flashing the first time, otherwise Intel GBE region (Ethernet config blob) will be overwitten and MAC reverted to '88:88:88:88:87:88' + +# Meteor Lake (Intel Gen 14) is not supposed to support s3 but coincidently does. In case s3 is broken, user must configure settings to not suspend or otherwise enable ME/CSME for s01x to work (unsupported by QubesOS when writing those lines) or use Hibernate (Not supported by QubesOS either) export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=dasharo @@ -72,5 +77,5 @@ export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_KERNEL_ADD="" export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" export CONFIG_BOARD_NAME="NovaCustom V540TU" -export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal" +export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd -i bios -i me -i fd" export CONFIG_AUTO_BOOT_TIMEOUT=5 diff --git a/boards/novacustom-v560tu/novacustom-v560tu.config b/boards/novacustom-v560tu/novacustom-v560tu.config index 1e6e5972..51699c4a 100644 --- a/boards/novacustom-v560tu/novacustom-v560tu.config +++ b/boards/novacustom-v560tu/novacustom-v560tu.config @@ -1,4 +1,9 @@ # NovaCustom V54 MTL (integrated graphics) board configuration +# Note the FLASH_OPTIONS: '--ifd -i bios -i me -i fd' +# This excludes gbe from internal flashing, otherwise mac address would revert to '88:88:88:88:87:88' see https://github.com/linuxboot/heads/pull/1871#discussion_r1870134788 +# Same options should be used when externally flashing the first time, otherwise Intel GBE region (Ethernet config blob) will be overwitten and MAC reverted to '88:88:88:88:87:88' + +# Meteor Lake (Intel Gen 14) is not supposed to support s3 but coincidently does. In case s3 is broken, user must configure settings to not suspend or otherwise enable ME/CSME for s01x to work (unsupported by QubesOS when writing those lines) or use Hibernate (Not supported by QubesOS either) export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=dasharo @@ -72,5 +77,5 @@ export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_KERNEL_ADD="" export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" export CONFIG_BOARD_NAME="NovaCustom V540TU" -export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal" +export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd -i bios -i me -i fd" export CONFIG_AUTO_BOOT_TIMEOUT=5