configs/config.dell_optiplex_9010_sff_uefi*: remove redundant flags

Signed-off-by: Filip Lewiński <[email protected]>
Dasharo · Jul 30, 2024 · f48831d · f48831d
1 parent 2801977
commit f48831d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/configs/config.dell_optiplex_9010_sff_uefi b/configs/config.dell_optiplex_9010_sff_uefi
@@ -6,9 +6,9 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_HAVE_EM100_SUPPORT=y
-CONFIG_LOCALVERSION="v0.1.0"
+CONFIG_LOCALVERSION="v0.1.0-rc1"
 CONFIG_PAYLOAD_EDK2=y
-CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/evaluation_logo.bmp"
+CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
 CONFIG_EDK2_BOOT_MENU_KEY=0x0011
 CONFIG_EDK2_GOP_DRIVER=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
@@ -19,8 +19,6 @@ CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SD_MMC_TIMEOUT=1000
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_DELL=y
-CONFIG_BOOTSPLASH_FILE="dasharo-black.bmp"
-CONFIG_BOOTSPLASH_IMAGE=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_TPM2=n
@@ -40,8 +38,6 @@ CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
-CONFIG_SMSC_SCH5545_EC_FW_FILE="sch5545_ecfw.bin"
-CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y
 CONFIG_EDK2_SETUP_PASSWORD=y
 CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
-CONFIG_BOOTMEDIA_SMM_BWP=y
+CONFIG_FMDFILE="src/mainboard/dell/snb_ivb_workstations/default.fmd"
diff --git a/configs/config.dell_optiplex_9010_sff_uefi_txt b/configs/config.dell_optiplex_9010_sff_uefi_txt
@@ -6,9 +6,9 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_HAVE_EM100_SUPPORT=y
-CONFIG_LOCALVERSION="v0.1.0"
+CONFIG_LOCALVERSION="v0.1.0-rc1"
 CONFIG_PAYLOAD_EDK2=y
-CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/evaluation_logo.bmp"
+CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
 CONFIG_EDK2_BOOT_MENU_KEY=0x0011
 CONFIG_EDK2_GOP_DRIVER=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
@@ -19,8 +19,6 @@ CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SD_MMC_TIMEOUT=1000
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_DELL=y
-CONFIG_BOOTSPLASH_FILE="dasharo-black.bmp"
-CONFIG_BOOTSPLASH_IMAGE=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_TPM2=n
@@ -40,14 +38,11 @@ CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
-CONFIG_SMSC_SCH5545_EC_FW_FILE="sch5545_ecfw.bin"
-CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y
 CONFIG_EDK2_SETUP_PASSWORD=y
 CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_TXT_BDR_VERSION=4
-CONFIG_INTEL_TXT_BIOSACM_FILE="IVB_BIOSAC_PRODUCTION.BIN"
-CONFIG_INTEL_TXT_SINITACM_FILE="SNB_IVB_SINIT_20190708_PW.bin"
+CONFIG_INTEL_TXT_BIOSACM_FILE="3rdparty/blobs/mainboard/dell/snb_ivb_workstations/IVB_BIOSAC_PRODUCTION.BIN"
+CONFIG_INTEL_TXT_SINITACM_FILE="3rdparty/blobs/mainboard/dell/snb_ivb_workstations/SNB_IVB_SINIT_20190708_PW.bin"
 CONFIG_INTEL_TXT_LOGGING=y
 CONFIG_FMDFILE="src/mainboard/dell/snb_ivb_workstations/default.fmd"
-CONFIG_BOOTMEDIA_SMM_BWP=y