configs/config.protectli_cml: Enable CBFS serial and UUID

Signed-off-by: Michał Żygowski <[email protected]>
Dasharo · Oct 4, 2023 · e298301 · e298301
1 parent 872417b
commit e298301
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/configs/config.protectli_cml_vp4630_vp4650 b/configs/config.protectli_cml_vp4630_vp4650
@@ -33,7 +33,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="d73eb32e986562fcc07eeb805ed265b5950499ef"
+CONFIG_EDK2_TAG_OR_REV="eae8d0e1eef8a5cee095880a47accdd49fac74c1"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
@@ -51,8 +51,10 @@ CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
 CONFIG_EDK2_BOOT_MENU_KEY=0x0015
 CONFIG_EDK2_SETUP_MENU_KEY=0x0008
 # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
-CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D LOAD_OPTION_ROMS=FALSE"
+CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D LOAD_OPTION_ROMS=FALSE -D PERFORMANCE_MEASUREMENT_ENABLE=TRUE"
 CONFIG_EDK2_LAN_ROM_DRIVER="3rdparty/blobs/mainboard/protectli/vault_cml/E0104X7.EFI"
 CONFIG_PXE_ADD_SCRIPT=y
 CONFIG_PXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe"
 CONFIG_PXE_CUSTOM_BUILD_ID="0123456789"
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
diff --git a/configs/config.protectli_cml_vp4670 b/configs/config.protectli_cml_vp4670
@@ -33,7 +33,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="d73eb32e986562fcc07eeb805ed265b5950499ef"
+CONFIG_EDK2_TAG_OR_REV="eae8d0e1eef8a5cee095880a47accdd49fac74c1"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
@@ -51,8 +51,10 @@ CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
 CONFIG_EDK2_BOOT_MENU_KEY=0x0015
 CONFIG_EDK2_SETUP_MENU_KEY=0x0008
 # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
-CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D LOAD_OPTION_ROMS=FALSE"
+CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D LOAD_OPTION_ROMS=FALSE -D PERFORMANCE_MEASUREMENT_ENABLE=TRUE"
 CONFIG_EDK2_LAN_ROM_DRIVER="3rdparty/blobs/mainboard/protectli/vault_cml/E0104X7.EFI"
 CONFIG_PXE_ADD_SCRIPT=y
 CONFIG_PXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe"
 CONFIG_PXE_CUSTOM_BUILD_ID="0123456789"
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
diff --git a/configs/config.protectli_vp4670_txt b/configs/config.protectli_vp4670_txt
@@ -38,7 +38,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="91d01a5e577475894e7cce06d59e392cbbffba22"
+CONFIG_EDK2_TAG_OR_REV="eae8d0e1eef8a5cee095880a47accdd49fac74c1"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
@@ -56,8 +56,10 @@ CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
 CONFIG_EDK2_BOOT_MENU_KEY=0x0015
 CONFIG_EDK2_SETUP_MENU_KEY=0x0008
 # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
-CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D LOAD_OPTION_ROMS=FALSE"
+CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D LOAD_OPTION_ROMS=FALSE -D PERFORMANCE_MEASUREMENT_ENABLE=TRUE"
 CONFIG_EDK2_LAN_ROM_DRIVER="3rdparty/blobs/mainboard/protectli/vault_cml/E0104X7.EFI"
 CONFIG_PXE_ADD_SCRIPT=y
 CONFIG_PXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe"
 CONFIG_PXE_CUSTOM_BUILD_ID="0123456789"
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
diff --git a/src/mainboard/protectli/vault_cml/Kconfig b/src/mainboard/protectli/vault_cml/Kconfig
@@ -49,6 +49,7 @@ config VBOOT
 	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_NO_TPM
 	select HAS_RECOVERY_MRC_CACHE
+	select VBOOT_ENABLE_CBFS_FALLBACK
 
 config VBOOT_SLOTS_RW_A
 	default y if VBOOT