Skip to content

Commit 960d1db

Browse files
filipleplefilipleple
committed
MTL: minimize config diff WIP
Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
1 parent 141f235 commit 960d1db

2 files changed

Lines changed: 26 additions & 58 deletions

File tree

‎config/coreboot-novacustom-v540tu.config‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
176176
CONFIG_DRIVERS_INTEL_WIFI=y
177177
CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/descriptor.bin"
178178
CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/me.bin"
179-
CONFIG_GBE_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/gbe.bin"
180179
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x200000
181180
CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=36
182181
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
@@ -312,9 +311,7 @@ CONFIG_MAX_MEI_DEVICES=4
312311
CONFIG_BOOTBLOCK_IN_CBFS=y
313312
CONFIG_HAVE_PAM0_REGISTER=y
314313
CONFIG_PCIEXP_COMMON_CLOCK=y
315-
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
316-
CONFIG_INTEL_TXT_SINIT_SIZE=0x20000
317-
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=16
314+
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
318315
CONFIG_SOC_INTEL_METEORLAKE=y
319316
CONFIG_SOC_INTEL_METEORLAKE_U_H=y
320317
CONFIG_SOC_INTEL_METEORLAKE_TCSS_USB4_SUPPORT=y
@@ -544,7 +541,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
544541
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
545542
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
546543
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
547-
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
544+
CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
548545
# CONFIG_INTEL_CHIPSET_LOCKDOWN is not set
549546
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
550547
CONFIG_RCBA_LENGTH=0x4000
@@ -564,7 +561,7 @@ CONFIG_EC_DASHARO_EC_UPDATE_FILE="ec.rom"
564561
#
565562
# Intel Firmware
566563
#
567-
# CONFIG_IFDTOOL_DISABLE_ME is not set
564+
CONFIG_IFDTOOL_DISABLE_ME=y
568565
CONFIG_HAVE_ME_BIN=y
569566
# CONFIG_STITCH_ME_BIN is not set
570567
# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
@@ -574,7 +571,7 @@ CONFIG_INTEL_ME_DISABLED_HAP=y
574571
# CONFIG_INTEL_ME_ENABLED is not set
575572
CONFIG_INTEL_ME_DEFAULT_STATE=2
576573
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
577-
CONFIG_HAVE_GBE_BIN=y
574+
# CONFIG_HAVE_GBE_BIN is not set
578575
# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
579576
# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
580577
CONFIG_UNLOCK_FLASH_REGIONS=y
@@ -588,7 +585,7 @@ CONFIG_BIOS_VENDOR="3mdeb"
588585
# Dasharo Configuration
589586
#
590587
CONFIG_DASHARO_PREFER_S3_SLEEP=y
591-
CONFIG_DASHARO_FIRMWARE_UPDATE_MODE=y
588+
# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set
592589
# end of Dasharo Configuration
593590

594591
CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
@@ -687,19 +684,20 @@ CONFIG_MRC_CACHE_USING_MRC_VERSION=y
687684
# CONFIG_DRIVERS_OPTION_CFR is not set
688685
# CONFIG_SMMSTORE is not set
689686
CONFIG_SPI_FLASH=y
690-
CONFIG_SPI_FLASH_SMM=y
691687
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
692688
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
689+
CONFIG_SPI_FLASH_SMM=y
693690
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
691+
CONFIG_TPM_INIT_RAMSTAGE=y
694692
CONFIG_TPM_PPI=y
695693
CONFIG_DRIVERS_UART=y
696694
CONFIG_NO_UART_ON_SUPERIO=y
697695
CONFIG_DRIVERS_UART_8250MEM=y
698696
CONFIG_DRIVERS_UART_8250MEM_32=y
699697
# CONFIG_VPD is not set
700698
CONFIG_DRIVERS_GENERIC_BAYHUB_LV2=y
701-
CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
702-
CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
699+
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
700+
# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
703701
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
704702
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
705703
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
@@ -736,10 +734,10 @@ CONFIG_FSP_ENABLE_SERIAL_DEBUG=y
736734
# CONFIG_BUILDING_WITH_DEBUG_FSP is not set
737735
CONFIG_INTEL_GMA_ACPI=y
738736
CONFIG_VBT_CBFS_COMPRESSION_DEFAULT_LZ4=y
739-
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
740-
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
737+
# CONFIG_VBT_CBFS_COMPRESSION_LZMA is not set
738+
CONFIG_VBT_CBFS_COMPRESSION_LZ4=y
741739
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
742-
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
740+
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lz4"
743741
CONFIG_INTEL_GMA_OPREGION_2_1=y
744742
CONFIG_INTEL_GMA_VERSION_2=y
745743
CONFIG_DRIVERS_INTEL_PMC=y
@@ -783,15 +781,13 @@ CONFIG_TPM2=y
783781
CONFIG_TPM=y
784782
CONFIG_MAINBOARD_HAS_TPM2=y
785783
# CONFIG_DEBUG_TPM is not set
786-
CONFIG_TPM_STARTUP_IGNORE_POSTINIT=y
787784
# CONFIG_TPM_LOG_CB is not set
788785
# CONFIG_TPM_LOG_TCG is not set
789786
CONFIG_TPM_LOG_TPM2=y
790787
CONFIG_TPM_HASH_SHA1=y
791788
CONFIG_TPM_HASH_SHA256=y
792789
# CONFIG_TPM_HASH_SHA384 is not set
793790
# CONFIG_TPM_HASH_SHA512 is not set
794-
CONFIG_TPM_MEASURED_BOOT_INIT_BOOTBLOCK=y
795791
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
796792
CONFIG_PCR_BOOT_MODE=1
797793
CONFIG_PCR_HWID=1
@@ -807,22 +803,10 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
807803
# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
808804
# end of Memory initialization
809805

810-
CONFIG_INTEL_ACM=y
811-
CONFIG_INTEL_TXT_BIOSACM_FILE=""
812-
CONFIG_INTEL_TXT_SINITACM_FILE=""
813-
CONFIG_INTEL_TXT_CBFS_BIOS_ACM="txt_bios_acm.bin"
814-
CONFIG_INTEL_TXT_CBFS_SINIT_ACM="txt_sinit_acm.bin"
815-
# CONFIG_INTEL_TXT_BIOSACM_STUB is not set
816806
CONFIG_INTEL_TXT_LIB=y
817807
# CONFIG_INTEL_TXT is not set
818808
# CONFIG_STM is not set
819-
CONFIG_INTEL_CBNT_SUPPORT=y
820-
CONFIG_INTEL_CBNT_LOGGING=y
821-
# CONFIG_INTEL_CBNT_GENERATE_KM is not set
822-
# CONFIG_INTEL_CBNT_GENERATE_BPM is not set
823-
CONFIG_INTEL_CBNT_KEY_MANIFEST_BINARY="3rdparty/dasharo-blobs/cbnt/km_sample.bin"
824-
CONFIG_INTEL_CBNT_BOOT_POLICY_MANIFEST_BINARY="3rdparty/dasharo-blobs/cbnt/bpm_sample.bin"
825-
CONFIG_INTEL_CBNT_CMOS_OFFSET=0x7e
809+
# CONFIG_INTEL_CBNT_SUPPORT is not set
826810
# CONFIG_BOOTMEDIA_LOCK_NONE is not set
827811
CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
828812
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set

‎config/coreboot-novacustom-v560tu.config‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
176176
CONFIG_DRIVERS_INTEL_WIFI=y
177177
CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/descriptor.bin"
178178
CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/me.bin"
179-
CONFIG_GBE_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/gbe.bin"
180179
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x200000
181180
CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=36
182181
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
@@ -312,9 +311,7 @@ CONFIG_MAX_MEI_DEVICES=4
312311
CONFIG_BOOTBLOCK_IN_CBFS=y
313312
CONFIG_HAVE_PAM0_REGISTER=y
314313
CONFIG_PCIEXP_COMMON_CLOCK=y
315-
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
316-
CONFIG_INTEL_TXT_SINIT_SIZE=0x20000
317-
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=16
314+
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
318315
CONFIG_SOC_INTEL_METEORLAKE=y
319316
CONFIG_SOC_INTEL_METEORLAKE_U_H=y
320317
CONFIG_SOC_INTEL_METEORLAKE_TCSS_USB4_SUPPORT=y
@@ -544,7 +541,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
544541
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
545542
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
546543
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
547-
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
544+
CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
548545
# CONFIG_INTEL_CHIPSET_LOCKDOWN is not set
549546
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
550547
CONFIG_RCBA_LENGTH=0x4000
@@ -564,7 +561,7 @@ CONFIG_EC_DASHARO_EC_UPDATE_FILE="ec.rom"
564561
#
565562
# Intel Firmware
566563
#
567-
# CONFIG_IFDTOOL_DISABLE_ME is not set
564+
CONFIG_IFDTOOL_DISABLE_ME=y
568565
CONFIG_HAVE_ME_BIN=y
569566
# CONFIG_STITCH_ME_BIN is not set
570567
# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
@@ -574,7 +571,7 @@ CONFIG_INTEL_ME_DISABLED_HAP=y
574571
# CONFIG_INTEL_ME_ENABLED is not set
575572
CONFIG_INTEL_ME_DEFAULT_STATE=2
576573
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
577-
CONFIG_HAVE_GBE_BIN=y
574+
# CONFIG_HAVE_GBE_BIN is not set
578575
# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
579576
# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
580577
CONFIG_UNLOCK_FLASH_REGIONS=y
@@ -588,7 +585,7 @@ CONFIG_BIOS_VENDOR="3mdeb"
588585
# Dasharo Configuration
589586
#
590587
CONFIG_DASHARO_PREFER_S3_SLEEP=y
591-
CONFIG_DASHARO_FIRMWARE_UPDATE_MODE=y
588+
# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set
592589
# end of Dasharo Configuration
593590

594591
CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
@@ -687,19 +684,20 @@ CONFIG_MRC_CACHE_USING_MRC_VERSION=y
687684
# CONFIG_DRIVERS_OPTION_CFR is not set
688685
# CONFIG_SMMSTORE is not set
689686
CONFIG_SPI_FLASH=y
690-
CONFIG_SPI_FLASH_SMM=y
691687
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
692688
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
689+
CONFIG_SPI_FLASH_SMM=y
693690
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
691+
CONFIG_TPM_INIT_RAMSTAGE=y
694692
CONFIG_TPM_PPI=y
695693
CONFIG_DRIVERS_UART=y
696694
CONFIG_NO_UART_ON_SUPERIO=y
697695
CONFIG_DRIVERS_UART_8250MEM=y
698696
CONFIG_DRIVERS_UART_8250MEM_32=y
699697
# CONFIG_VPD is not set
700698
CONFIG_DRIVERS_GENERIC_BAYHUB_LV2=y
701-
CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
702-
CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
699+
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
700+
# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
703701
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
704702
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
705703
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
@@ -736,10 +734,10 @@ CONFIG_FSP_ENABLE_SERIAL_DEBUG=y
736734
# CONFIG_BUILDING_WITH_DEBUG_FSP is not set
737735
CONFIG_INTEL_GMA_ACPI=y
738736
CONFIG_VBT_CBFS_COMPRESSION_DEFAULT_LZ4=y
739-
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
740-
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
737+
# CONFIG_VBT_CBFS_COMPRESSION_LZMA is not set
738+
CONFIG_VBT_CBFS_COMPRESSION_LZ4=y
741739
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
742-
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
740+
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lz4"
743741
CONFIG_INTEL_GMA_OPREGION_2_1=y
744742
CONFIG_INTEL_GMA_VERSION_2=y
745743
CONFIG_DRIVERS_INTEL_PMC=y
@@ -783,15 +781,13 @@ CONFIG_TPM2=y
783781
CONFIG_TPM=y
784782
CONFIG_MAINBOARD_HAS_TPM2=y
785783
# CONFIG_DEBUG_TPM is not set
786-
CONFIG_TPM_STARTUP_IGNORE_POSTINIT=y
787784
# CONFIG_TPM_LOG_CB is not set
788785
# CONFIG_TPM_LOG_TCG is not set
789786
CONFIG_TPM_LOG_TPM2=y
790787
CONFIG_TPM_HASH_SHA1=y
791788
CONFIG_TPM_HASH_SHA256=y
792789
# CONFIG_TPM_HASH_SHA384 is not set
793790
# CONFIG_TPM_HASH_SHA512 is not set
794-
CONFIG_TPM_MEASURED_BOOT_INIT_BOOTBLOCK=y
795791
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
796792
CONFIG_PCR_BOOT_MODE=1
797793
CONFIG_PCR_HWID=1
@@ -807,22 +803,10 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
807803
# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
808804
# end of Memory initialization
809805

810-
CONFIG_INTEL_ACM=y
811-
CONFIG_INTEL_TXT_BIOSACM_FILE=""
812-
CONFIG_INTEL_TXT_SINITACM_FILE=""
813-
CONFIG_INTEL_TXT_CBFS_BIOS_ACM="txt_bios_acm.bin"
814-
CONFIG_INTEL_TXT_CBFS_SINIT_ACM="txt_sinit_acm.bin"
815-
# CONFIG_INTEL_TXT_BIOSACM_STUB is not set
816806
CONFIG_INTEL_TXT_LIB=y
817807
# CONFIG_INTEL_TXT is not set
818808
# CONFIG_STM is not set
819-
CONFIG_INTEL_CBNT_SUPPORT=y
820-
CONFIG_INTEL_CBNT_LOGGING=y
821-
# CONFIG_INTEL_CBNT_GENERATE_KM is not set
822-
# CONFIG_INTEL_CBNT_GENERATE_BPM is not set
823-
CONFIG_INTEL_CBNT_KEY_MANIFEST_BINARY="3rdparty/dasharo-blobs/cbnt/km_sample.bin"
824-
CONFIG_INTEL_CBNT_BOOT_POLICY_MANIFEST_BINARY="3rdparty/dasharo-blobs/cbnt/bpm_sample.bin"
825-
CONFIG_INTEL_CBNT_CMOS_OFFSET=0x7e
809+
# CONFIG_INTEL_CBNT_SUPPORT is not set
826810
# CONFIG_BOOTMEDIA_LOCK_NONE is not set
827811
CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
828812
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set

0 commit comments

Comments
 (0)