From 3ac1f21c7a2abc94cacaf717021cc4be849355a2 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 5 Jul 2021 12:13:32 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56079 Reviewed-by: Arthur Heymans Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- ...config.cavium_cn8100_sff_evb_bdk_verbose_fit_payload_support | 1 + configs/config.emulation_qemu_aarch64_fit_support_timestamps | 1 + configs/config.emulation_qemu_riscv_rv64 | 1 + configs/config.emulation_qemu_x86_i440fx_asan | 2 ++ configs/config.emulation_qemu_x86_i440fx_debug | 2 ++ configs/config.emulation_qemu_x86_i440fx_noserial | 2 ++ configs/config.emulation_qemu_x86_i440fx_x86_64 | 2 ++ configs/config.emulation_qemu_x86_q35_smm_tseg | 1 + configs/config.facebook_fbg1701.mboot_vboot | 1 + configs/config.libretrend_lt1000 | 1 + configs/config.ocp_deltalake_cbnt | 1 + configs/config.portwell_m107.debug_smmstore_oxpcie_em100spi | 1 + configs/config.up_squared.vboot_spi_flash_console | 1 + 13 files changed, 17 insertions(+) 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 951855e333..1727cc75b1 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 7d0054ca6b..2b5234afcf 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 d41963c157..f5bce48a08 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 a4b504ea76..3d7f059daa 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 e39ff590fd..85f5499986 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 2902d02a95..f71c0aeef5 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 d31bbf2d61..712364677a 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 6484c6c29c..6d64715394 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 34d349a8cb..08f0c70347 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 33159f16da..0d4f5436cc 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 4df1043709..4e7756626a 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 09dfbe35cf..0861af3891 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 a537035c69..351e1ca8d6 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