From bd70bb50147e914ff983307cc73b235f6f29bf20 Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Fri, 14 Jun 2024 19:05:09 +0300 Subject: [PATCH] configs: run savedefconfig on Dasharo EDK boards Change-Id: Ib2af25f7259c31f2e89dc10f473331733c255796 Signed-off-by: Sergii Dmytruk --- configs/config.msi_ms7d25_ddr4 | 10 +++------- configs/config.msi_ms7d25_ddr5 | 10 +++------- configs/config.msi_ms7e06_ddr4 | 12 ++++-------- configs/config.msi_ms7e06_ddr5 | 12 ++++-------- configs/config.pcengines_apu6 | 6 +----- configs/config.pcengines_uefi_apu2 | 7 +------ configs/config.pcengines_uefi_apu3 | 7 +------ configs/config.pcengines_uefi_apu4 | 7 +------ configs/config.pcengines_uefi_apu6 | 7 +------ configs/config.protectli_vault_jsl_v1210 | 6 +----- configs/config.protectli_vault_jsl_v1211 | 6 +----- configs/config.protectli_vault_jsl_v1410 | 6 +----- configs/config.protectli_vault_jsl_v1610 | 6 +----- configs/config.protectli_vp2410 | 6 +----- configs/config.protectli_vp46xx | 10 +++------- configs/config.protectli_vp46xx_txt | 13 ++++--------- 16 files changed, 31 insertions(+), 100 deletions(-) diff --git a/configs/config.msi_ms7d25_ddr4 b/configs/config.msi_ms7d25_ddr4 index 2416db6cfe9..15d49cbd72a 100644 --- a/configs/config.msi_ms7d25_ddr4 +++ b/configs/config.msi_ms7d25_ddr4 @@ -7,12 +7,14 @@ CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=3 +CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_MSI_Z690_A_PRO_WIFI_DDR4=y # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" +CONFIG_TPM_MEASURED_BOOT=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y CONFIG_INCLUDE_HSPHY_IN_FMAP=y CONFIG_SOC_INTEL_COMMON_OC_WDT_ENABLE=y @@ -20,12 +22,10 @@ CONFIG_ENABLE_EARLY_DMA_PROTECTION=y CONFIG_HAVE_ME_BIN=y CONFIG_DASHARO_PREFER_S3_SLEEP=y CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y -CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y CONFIG_DRIVERS_EFI_VARIABLE_STORE=y CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y CONFIG_TPM2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y @@ -42,8 +42,8 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -61,8 +61,4 @@ CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_RAM_DISK_ENABLE=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.msi_ms7d25_ddr5 b/configs/config.msi_ms7d25_ddr5 index 54b49c8c62d..f9eec82b4a6 100644 --- a/configs/config.msi_ms7d25_ddr5 +++ b/configs/config.msi_ms7d25_ddr5 @@ -7,12 +7,14 @@ CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=3 +CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_MSI_Z690_A_PRO_WIFI_DDR5=y # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" +CONFIG_TPM_MEASURED_BOOT=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y CONFIG_INCLUDE_HSPHY_IN_FMAP=y CONFIG_SOC_INTEL_COMMON_OC_WDT_ENABLE=y @@ -20,12 +22,10 @@ CONFIG_ENABLE_EARLY_DMA_PROTECTION=y CONFIG_HAVE_ME_BIN=y CONFIG_DASHARO_PREFER_S3_SLEEP=y CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y -CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y CONFIG_DRIVERS_EFI_VARIABLE_STORE=y CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y CONFIG_TPM2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y @@ -42,8 +42,8 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -61,8 +61,4 @@ CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_RAM_DISK_ENABLE=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.msi_ms7e06_ddr4 b/configs/config.msi_ms7e06_ddr4 index d747932c819..9501fcdb5e2 100644 --- a/configs/config.msi_ms7e06_ddr4 +++ b/configs/config.msi_ms7e06_ddr4 @@ -6,12 +6,14 @@ CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=3 +CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_MSI_Z790_P_PRO_WIFI_DDR4=y # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" +CONFIG_TPM_MEASURED_BOOT=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y CONFIG_INCLUDE_HSPHY_IN_FMAP=y CONFIG_SOC_INTEL_COMMON_OC_WDT_ENABLE=y @@ -19,12 +21,10 @@ CONFIG_ENABLE_EARLY_DMA_PROTECTION=y CONFIG_HAVE_ME_BIN=y CONFIG_DASHARO_PREFER_S3_SLEEP=y CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y -CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y CONFIG_DRIVERS_EFI_VARIABLE_STORE=y CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y CONFIG_TPM2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y @@ -41,8 +41,9 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y +# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y CONFIG_EDK2_SETUP_PASSWORD=y @@ -59,9 +60,4 @@ CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_RAM_DISK_ENABLE=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" -# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.msi_ms7e06_ddr5 b/configs/config.msi_ms7e06_ddr5 index 7bfe8dc7cbc..a69ad36ef2a 100644 --- a/configs/config.msi_ms7e06_ddr5 +++ b/configs/config.msi_ms7e06_ddr5 @@ -6,12 +6,14 @@ CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=3 +CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_MSI_Z790_P_PRO_WIFI_DDR5=y # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" +CONFIG_TPM_MEASURED_BOOT=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y CONFIG_INCLUDE_HSPHY_IN_FMAP=y CONFIG_SOC_INTEL_COMMON_OC_WDT_ENABLE=y @@ -19,12 +21,10 @@ CONFIG_ENABLE_EARLY_DMA_PROTECTION=y CONFIG_HAVE_ME_BIN=y CONFIG_DASHARO_PREFER_S3_SLEEP=y CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y -CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=37 CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y CONFIG_DRIVERS_EFI_VARIABLE_STORE=y CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y CONFIG_TPM2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y @@ -41,8 +41,9 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y +# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y CONFIG_EDK2_SETUP_PASSWORD=y @@ -59,9 +60,4 @@ CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_RAM_DISK_ENABLE=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" -# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.pcengines_apu6 b/configs/config.pcengines_apu6 index b871b9724be..67109acd4d1 100644 --- a/configs/config.pcengines_apu6 +++ b/configs/config.pcengines_apu6 @@ -20,8 +20,8 @@ CONFIG_EDK2_USE_EDK2_PLATFORMS=y CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms" CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -35,8 +35,4 @@ CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_RAM_DISK_ENABLE=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.pcengines_uefi_apu2 b/configs/config.pcengines_uefi_apu2 index 47cecff2748..22ade36fe21 100644 --- a/configs/config.pcengines_uefi_apu2 +++ b/configs/config.pcengines_uefi_apu2 @@ -5,7 +5,6 @@ CONFIG_VBOOT=y CONFIG_PXE_ROM_ID="8086,157b" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=6 -# CONFIG_HUDSON_LEGACY_FREE is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" CONFIG_TPM_MEASURED_BOOT=y CONFIG_UDK_202005_BINDING=y @@ -28,8 +27,8 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -45,8 +44,4 @@ CONFIG_EDK2_HAVE_2ND_UART=y CONFIG_EDK2_BOOT_MENU_KEY=0x0014 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.pcengines_uefi_apu3 b/configs/config.pcengines_uefi_apu3 index 4ffa633b83b..f93967fa904 100644 --- a/configs/config.pcengines_uefi_apu3 +++ b/configs/config.pcengines_uefi_apu3 @@ -6,7 +6,6 @@ CONFIG_PXE_ROM_ID="8086,1539" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=6 CONFIG_BOARD_PCENGINES_APU3=y -# CONFIG_HUDSON_LEGACY_FREE is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" CONFIG_TPM_MEASURED_BOOT=y CONFIG_UDK_202005_BINDING=y @@ -29,8 +28,8 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -46,8 +45,4 @@ CONFIG_EDK2_HAVE_2ND_UART=y CONFIG_EDK2_BOOT_MENU_KEY=0x0014 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.pcengines_uefi_apu4 b/configs/config.pcengines_uefi_apu4 index f0904a59433..490866e68a7 100644 --- a/configs/config.pcengines_uefi_apu4 +++ b/configs/config.pcengines_uefi_apu4 @@ -6,7 +6,6 @@ CONFIG_PXE_ROM_ID="8086,1539" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=6 CONFIG_BOARD_PCENGINES_APU4=y -# CONFIG_HUDSON_LEGACY_FREE is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" CONFIG_TPM_MEASURED_BOOT=y CONFIG_UDK_202005_BINDING=y @@ -29,8 +28,8 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -46,8 +45,4 @@ CONFIG_EDK2_HAVE_2ND_UART=y CONFIG_EDK2_BOOT_MENU_KEY=0x0014 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.pcengines_uefi_apu6 b/configs/config.pcengines_uefi_apu6 index 8e48a201414..5bde721bbc2 100644 --- a/configs/config.pcengines_uefi_apu6 +++ b/configs/config.pcengines_uefi_apu6 @@ -6,7 +6,6 @@ CONFIG_PXE_ROM_ID="8086,1539" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=6 CONFIG_BOARD_PCENGINES_APU6=y -# CONFIG_HUDSON_LEGACY_FREE is not set CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" CONFIG_TPM_MEASURED_BOOT=y CONFIG_UDK_202005_BINDING=y @@ -29,8 +28,8 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" CONFIG_EDK2_CBMEM_LOGGING=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SATA_PASSWORD=y CONFIG_EDK2_OPAL_PASSWORD=y @@ -46,8 +45,4 @@ CONFIG_EDK2_HAVE_2ND_UART=y CONFIG_EDK2_BOOT_MENU_KEY=0x0014 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vault_jsl_v1210 b/configs/config.protectli_vault_jsl_v1210 index 8c5f1bab46d..22778a2e747 100644 --- a/configs/config.protectli_vault_jsl_v1210 +++ b/configs/config.protectli_vault_jsl_v1210 @@ -35,9 +35,9 @@ CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y @@ -45,8 +45,4 @@ CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vault_jsl_v1211 b/configs/config.protectli_vault_jsl_v1211 index 8bff2c0be58..8558613dcd0 100644 --- a/configs/config.protectli_vault_jsl_v1211 +++ b/configs/config.protectli_vault_jsl_v1211 @@ -35,9 +35,9 @@ CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y @@ -45,8 +45,4 @@ CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_PXE_ADD_SCRIPT=y -CONFIG_PXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_PXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vault_jsl_v1410 b/configs/config.protectli_vault_jsl_v1410 index 9b3a11a05a5..3f51b569bbd 100644 --- a/configs/config.protectli_vault_jsl_v1410 +++ b/configs/config.protectli_vault_jsl_v1410 @@ -35,9 +35,9 @@ CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y @@ -45,8 +45,4 @@ CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vault_jsl_v1610 b/configs/config.protectli_vault_jsl_v1610 index fb6c7b6fb5f..248187a7d06 100644 --- a/configs/config.protectli_vault_jsl_v1610 +++ b/configs/config.protectli_vault_jsl_v1610 @@ -35,9 +35,9 @@ CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y @@ -45,8 +45,4 @@ CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vp2410 b/configs/config.protectli_vp2410 index 565ef65e724..5d248a9814a 100644 --- a/configs/config.protectli_vp2410 +++ b/configs/config.protectli_vp2410 @@ -40,9 +40,9 @@ CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PRIORITIZE_INTERNAL is not set # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SETUP_PASSWORD=y CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y @@ -53,8 +53,4 @@ CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vp46xx b/configs/config.protectli_vp46xx index f407e021757..f03f8cd7b8e 100644 --- a/configs/config.protectli_vp46xx +++ b/configs/config.protectli_vp46xx @@ -12,8 +12,8 @@ CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_PROTECTLI_VP46XX=y CONFIG_EDK2_BOOTSPLASH_FILE="$(top)/3rdparty/dasharo-blobs/protectli/bootsplash.bmp" CONFIG_TPM_MEASURED_BOOT=y -CONFIG_SOC_INTEL_COMMON_OC_WDT_WDAT=y CONFIG_USE_INTEL_FSP_MP_INIT=y +CONFIG_SOC_INTEL_COMMON_OC_WDT_WDAT=y CONFIG_HAVE_ME_BIN=y CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS=y CONFIG_INTEL_ME_DISABLED_HECI=y @@ -41,23 +41,19 @@ CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_SETUP_PASSWORD=y CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y CONFIG_EDK2_DASHARO_USB_CONFIG=y CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y +CONFIG_EDK2_DASHARO_OC_WDT_SHOW=y CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y -CONFIG_EDK2_DASHARO_OC_WDT_SHOW=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" diff --git a/configs/config.protectli_vp46xx_txt b/configs/config.protectli_vp46xx_txt index 2b618313cb2..d35492ac74c 100644 --- a/configs/config.protectli_vp46xx_txt +++ b/configs/config.protectli_vp46xx_txt @@ -3,17 +3,17 @@ CONFIG_OPTION_BACKEND_NONE=y CONFIG_VENDOR_PROTECTLI=y CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_VBOOT=y +CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin" +CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000 CONFIG_EDK2_BOOT_TIMEOUT=6 CONFIG_USE_LEGACY_8254_TIMER=y CONFIG_HAVE_IFD_BIN=y -CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/descriptor.bin" -CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/$(MAINBOARDDIR)/me.bin" CONFIG_BOARD_PROTECTLI_VP46XX=y CONFIG_EDK2_BOOTSPLASH_FILE="$(top)/3rdparty/dasharo-blobs/protectli/bootsplash.bmp" CONFIG_TPM_MEASURED_BOOT=y -CONFIG_SOC_INTEL_COMMON_OC_WDT_WDAT=y CONFIG_USE_INTEL_FSP_MP_INIT=y +CONFIG_SOC_INTEL_COMMON_OC_WDT_WDAT=y CONFIG_HAVE_ME_BIN=y CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS=y CONFIG_RUN_FSP_GOP=y @@ -42,21 +42,16 @@ CONFIG_EDK2_CBMEM_LOGGING=y CONFIG_EDK2_FOLLOW_BGRT_SPEC=y # CONFIG_EDK2_PS2_SUPPORT is not set CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_ENABLE_IPXE=y CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities" -CONFIG_EDK2_SECURE_BOOT_SUPPORT=y # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y CONFIG_EDK2_DASHARO_USB_CONFIG=y CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y -CONFIG_EDK2_DASHARO_OC_WDT_SHOW=y CONFIG_EDK2_BOOT_MENU_KEY=0x0015 CONFIG_EDK2_SETUP_MENU_KEY=0x0008 CONFIG_EDK2_DISABLE_OPTION_ROMS=y -CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y -CONFIG_IPXE_ADD_SCRIPT=y -CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/protectli.ipxe" -CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789"