Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/56079 )
Change subject: configs: Explicitly specify vendor and mainboard ......................................................................
configs: Explicitly specify vendor and mainboard
Relying on the implicit defaults for these settings can cause issues in the future. For example, commit 8cc4c5a1e76c0c8aee3a14618c15d38e3bd2bd61 (config.dell_optiplex_9010_sff: Specify board model) was done to prevent a build failure when adding support for other Dell mainboards which make the default board change.
Change-Id: Ie0da6254def8b38e9fb053fc7d530dfb46760861 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/56079 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M configs/config.cavium_cn8100_sff_evb_bdk_verbose_fit_payload_support M configs/config.emulation_qemu_aarch64_fit_support_timestamps M configs/config.emulation_qemu_riscv_rv64 M configs/config.emulation_qemu_x86_i440fx_asan M configs/config.emulation_qemu_x86_i440fx_debug M configs/config.emulation_qemu_x86_i440fx_noserial M configs/config.emulation_qemu_x86_i440fx_x86_64 M configs/config.emulation_qemu_x86_q35_smm_tseg M configs/config.facebook_fbg1701.mboot_vboot M configs/config.libretrend_lt1000 M configs/config.ocp_deltalake_cbnt M configs/config.portwell_m107.debug_smmstore_oxpcie_em100spi M configs/config.up_squared.vboot_spi_flash_console 13 files changed, 17 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Arthur Heymans: Looks good to me, approved
diff --git a/configs/config.cavium_cn8100_sff_evb_bdk_verbose_fit_payload_support b/configs/config.cavium_cn8100_sff_evb_bdk_verbose_fit_payload_support index 951855e..1727cc7 100644 --- a/configs/config.cavium_cn8100_sff_evb_bdk_verbose_fit_payload_support +++ b/configs/config.cavium_cn8100_sff_evb_bdk_verbose_fit_payload_support @@ -1,4 +1,5 @@ CONFIG_VENDOR_CAVIUM=y +CONFIG_BOARD_CAVIUM_CN8100_SFF_EVB=y CONFIG_CAVIUM_BDK_VERBOSE_INIT=y CONFIG_CAVIUM_BDK_VERBOSE_DRAM=y CONFIG_CAVIUM_BDK_VERBOSE_DRAM_TEST=y diff --git a/configs/config.emulation_qemu_aarch64_fit_support_timestamps b/configs/config.emulation_qemu_aarch64_fit_support_timestamps index 7d0054c..2b5234a 100644 --- a/configs/config.emulation_qemu_aarch64_fit_support_timestamps +++ b/configs/config.emulation_qemu_aarch64_fit_support_timestamps @@ -1,3 +1,4 @@ +CONFIG_VENDOR_EMULATION=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y CONFIG_MAINBOARD_VENDOR="Emulation" diff --git a/configs/config.emulation_qemu_riscv_rv64 b/configs/config.emulation_qemu_riscv_rv64 index d41963c..f5bce48 100644 --- a/configs/config.emulation_qemu_riscv_rv64 +++ b/configs/config.emulation_qemu_riscv_rv64 @@ -1,2 +1,3 @@ +CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64=y CONFIG_RISCV_OPENSBI=y diff --git a/configs/config.emulation_qemu_x86_i440fx_asan b/configs/config.emulation_qemu_x86_i440fx_asan index a4b504e..3d7f059 100644 --- a/configs/config.emulation_qemu_x86_i440fx_asan +++ b/configs/config.emulation_qemu_x86_i440fx_asan @@ -1 +1,3 @@ +CONFIG_VENDOR_EMULATION=y +CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_ASAN=y diff --git a/configs/config.emulation_qemu_x86_i440fx_debug b/configs/config.emulation_qemu_x86_i440fx_debug index e39ff59..85f5499 100644 --- a/configs/config.emulation_qemu_x86_i440fx_debug +++ b/configs/config.emulation_qemu_x86_i440fx_debug @@ -1,3 +1,5 @@ +CONFIG_VENDOR_EMULATION=y +CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_GDB_STUB=y CONFIG_GDB_WAIT=y CONFIG_FATAL_ASSERTS=y diff --git a/configs/config.emulation_qemu_x86_i440fx_noserial b/configs/config.emulation_qemu_x86_i440fx_noserial index 2902d02..f71c0ae 100644 --- a/configs/config.emulation_qemu_x86_i440fx_noserial +++ b/configs/config.emulation_qemu_x86_i440fx_noserial @@ -1,3 +1,5 @@ +CONFIG_VENDOR_EMULATION=y +CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_POST_IO is not set # CONFIG_POST_DEVICE is not set diff --git a/configs/config.emulation_qemu_x86_i440fx_x86_64 b/configs/config.emulation_qemu_x86_i440fx_x86_64 index d31bbf2..7123646 100644 --- a/configs/config.emulation_qemu_x86_i440fx_x86_64 +++ b/configs/config.emulation_qemu_x86_i440fx_x86_64 @@ -1 +1,3 @@ +CONFIG_VENDOR_EMULATION=y +CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y CONFIG_USE_EXP_X86_64_SUPPORT=y diff --git a/configs/config.emulation_qemu_x86_q35_smm_tseg b/configs/config.emulation_qemu_x86_q35_smm_tseg index 6484c6c..6d64715 100644 --- a/configs/config.emulation_qemu_x86_q35_smm_tseg +++ b/configs/config.emulation_qemu_x86_q35_smm_tseg @@ -1,3 +1,4 @@ +CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y CONFIG_CPU_QEMU_X86_PARALLEL_MP=y CONFIG_CPU_QEMU_X86_TSEG_SMM=y diff --git a/configs/config.facebook_fbg1701.mboot_vboot b/configs/config.facebook_fbg1701.mboot_vboot index 34d349a..08f0c70 100644 --- a/configs/config.facebook_fbg1701.mboot_vboot +++ b/configs/config.facebook_fbg1701.mboot_vboot @@ -1,4 +1,5 @@ CONFIG_VENDOR_FACEBOOK=y +CONFIG_BOARD_FACEBOOK_FBG1701=y CONFIG_ONBOARD_SAMSUNG_MEM=y CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFF8B000 CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y diff --git a/configs/config.libretrend_lt1000 b/configs/config.libretrend_lt1000 index 33159f1..0d4f543 100644 --- a/configs/config.libretrend_lt1000 +++ b/configs/config.libretrend_lt1000 @@ -1,4 +1,5 @@ CONFIG_VENDOR_LIBRETREND=y +CONFIG_BOARD_LIBRETREND_LT1000=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_TPM2=y diff --git a/configs/config.ocp_deltalake_cbnt b/configs/config.ocp_deltalake_cbnt index 4df1043..4e77566 100644 --- a/configs/config.ocp_deltalake_cbnt +++ b/configs/config.ocp_deltalake_cbnt @@ -1,4 +1,5 @@ CONFIG_VENDOR_OCP=y +CONFIG_BOARD_OCP_DELTALAKE=y CONFIG_INTEL_TXT_BIOSACM_FILE="3rdparty/intel-sec-tools/testdata/fake_acm/biosacm_cbnt_fake.bin" CONFIG_INTEL_TXT_LOGGING=y CONFIG_INTEL_CBNT_SUPPORT=y diff --git a/configs/config.portwell_m107.debug_smmstore_oxpcie_em100spi b/configs/config.portwell_m107.debug_smmstore_oxpcie_em100spi index 09dfbe3..0861af3 100644 --- a/configs/config.portwell_m107.debug_smmstore_oxpcie_em100spi +++ b/configs/config.portwell_m107.debug_smmstore_oxpcie_em100spi @@ -8,6 +8,7 @@ # + EM100Pro SPI console # + Debug options CONFIG_VENDOR_PORTWELL=y +CONFIG_BOARD_PORTWELL_M107=y CONFIG_CONSOLE_POST=y # CONFIG_CONSOLE_SERIAL is not set CONFIG_ENABLE_BUILTIN_COM1=y diff --git a/configs/config.up_squared.vboot_spi_flash_console b/configs/config.up_squared.vboot_spi_flash_console index a537035..351e1ca 100644 --- a/configs/config.up_squared.vboot_spi_flash_console +++ b/configs/config.up_squared.vboot_spi_flash_console @@ -1,3 +1,4 @@ CONFIG_VENDOR_UP=y +CONFIG_BOARD_UP_SQUARED=y CONFIG_VBOOT=y CONFIG_CONSOLE_SPI_FLASH=y