Skip to content

Commit d69667d

Browse files
committed
Fix MTL coreboot configs per PR #2082 review feedback
- Re-enable CONFIG_DASHARO_FIRMWARE_UPDATE_MODE=y (was incorrectly disabled) - Enable CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y (required for Dasharo) - Re-enable CONFIG_USE_PC_CMOS_ALTCENTURY=y (reverted broken commit) - Disable bootsplash (CONFIG_BOOTSPLASH=n, CONFIG_BOOTSPLASH_IMAGE=n) - Remove unused @COREBOOT_BUILD_DIR@ sed replacement in modules/coreboot
1 parent 70c4693 commit d69667d

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

config/coreboot-novacustom-v540tu.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
# CONFIG_NO_STAGE_CACHE is not set
3535
CONFIG_TSEG_STAGE_CACHE=y
3636
# CONFIG_UPDATE_IMAGE is not set
37-
CONFIG_BOOTSPLASH_IMAGE=y
37+
# CONFIG_BOOTSPLASH_IMAGE is not set
3838
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3939
CONFIG_BOOTSPLASH_REGION_LOGO_FILE=""
4040
CONFIG_BOOTSPLASH_CONVERT=y
@@ -584,7 +584,7 @@ CONFIG_BIOS_VENDOR="3mdeb"
584584
# Dasharo Configuration
585585
#
586586
CONFIG_DASHARO_PREFER_S3_SLEEP=y
587-
# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set
587+
CONFIG_DASHARO_FIRMWARE_UPDATE_MODE=y
588588
# end of Dasharo Configuration
589589

590590
CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
@@ -643,7 +643,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
643643
#
644644
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
645645
CONFIG_LINEAR_FRAMEBUFFER=y
646-
CONFIG_BOOTSPLASH=y
646+
# CONFIG_BOOTSPLASH is not set
647647
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
648648
# end of Display
649649

@@ -692,7 +692,7 @@ CONFIG_DRIVERS_UART_8250MEM=y
692692
CONFIG_DRIVERS_UART_8250MEM_32=y
693693
# CONFIG_VPD is not set
694694
CONFIG_DRIVERS_GENERIC_BAYHUB_LV2=y
695-
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
695+
CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
696696
# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
697697
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
698698
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
@@ -739,7 +739,7 @@ CONFIG_INTEL_GMA_VERSION_2=y
739739
CONFIG_DRIVERS_INTEL_PMC=y
740740
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
741741
CONFIG_DRIVERS_MC146818=y
742-
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
742+
CONFIG_USE_PC_CMOS_ALTCENTURY=y
743743
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
744744
CONFIG_MEMORY_MAPPED_TPM=y
745745
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000

config/coreboot-novacustom-v560tu.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
# CONFIG_NO_STAGE_CACHE is not set
3535
CONFIG_TSEG_STAGE_CACHE=y
3636
# CONFIG_UPDATE_IMAGE is not set
37-
CONFIG_BOOTSPLASH_IMAGE=y
37+
# CONFIG_BOOTSPLASH_IMAGE is not set
3838
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3939
CONFIG_BOOTSPLASH_REGION_LOGO_FILE=""
4040
CONFIG_BOOTSPLASH_CONVERT=y
@@ -584,7 +584,7 @@ CONFIG_BIOS_VENDOR="3mdeb"
584584
# Dasharo Configuration
585585
#
586586
CONFIG_DASHARO_PREFER_S3_SLEEP=y
587-
# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set
587+
CONFIG_DASHARO_FIRMWARE_UPDATE_MODE=y
588588
# end of Dasharo Configuration
589589

590590
CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
@@ -643,7 +643,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
643643
#
644644
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
645645
CONFIG_LINEAR_FRAMEBUFFER=y
646-
CONFIG_BOOTSPLASH=y
646+
# CONFIG_BOOTSPLASH is not set
647647
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
648648
# end of Display
649649

@@ -692,7 +692,7 @@ CONFIG_DRIVERS_UART_8250MEM=y
692692
CONFIG_DRIVERS_UART_8250MEM_32=y
693693
# CONFIG_VPD is not set
694694
CONFIG_DRIVERS_GENERIC_BAYHUB_LV2=y
695-
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
695+
CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
696696
# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
697697
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
698698
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
@@ -739,7 +739,7 @@ CONFIG_INTEL_GMA_VERSION_2=y
739739
CONFIG_DRIVERS_INTEL_PMC=y
740740
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
741741
CONFIG_DRIVERS_MC146818=y
742-
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
742+
CONFIG_USE_PC_CMOS_ALTCENTURY=y
743743
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
744744
CONFIG_MEMORY_MAPPED_TPM=y
745745
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000

modules/coreboot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ $(coreboot_module)_configure := \
199199
sed -i '/^CONFIG_MAINBOARD_SMBIOS_MANUFACTURER/d' $(build)/$(coreboot_dir)/.config; \
200200
echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config; \
201201
fi; \
202-
sed -i 's|@COREBOOT_BUILD_DIR@|$(build)/$(coreboot_dir)|g' "$(build)/$(coreboot_dir)/.config"; \
203202
$(MAKE) olddefconfig \
204203
-C "$(build)/$(coreboot_base_dir)" \
205204
obj="$(build)/$(coreboot_dir)" \

0 commit comments

Comments
 (0)