From e2c1ea7ad9c89cecde6664278ca7e2f57e7f37df Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sat, 29 Jan 2022 18:23:19 +0100 Subject: mb/**/Kconfig: Properly override `IGNORE_IASL_MISSING_DEPENDENCY` Don't unconditionally override `IGNORE_IASL_MISSING_DEPENDENCY`. Change-Id: I02081d0f04be4af9cd765aa3b29295af40f9ca99 Fixes: commit 28fa297901ffd158631cfc9f562f38119eff628e Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/61477 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes --- src/mainboard/asus/h61-series/Kconfig | 6 +++--- src/mainboard/google/auron/Kconfig | 7 +++---- src/mainboard/google/beltino/Kconfig | 7 +++---- src/mainboard/google/brya/Kconfig | 6 +++--- src/mainboard/google/cyan/Kconfig | 7 +++---- src/mainboard/google/dedede/Kconfig | 7 +++---- src/mainboard/google/deltaur/Kconfig | 7 +++---- src/mainboard/google/drallion/Kconfig | 7 +++---- src/mainboard/google/fizz/Kconfig | 7 +++---- src/mainboard/google/glados/Kconfig | 7 +++---- src/mainboard/google/guybrush/Kconfig | 6 +++--- src/mainboard/google/hatch/Kconfig | 6 +++--- src/mainboard/google/jecht/Kconfig | 7 +++---- src/mainboard/google/kahlee/Kconfig | 6 +++--- src/mainboard/google/octopus/Kconfig | 7 +++---- src/mainboard/google/poppy/Kconfig | 7 +++---- src/mainboard/google/rambi/Kconfig | 7 +++---- src/mainboard/google/reef/Kconfig | 7 +++---- src/mainboard/google/sarien/Kconfig | 6 +++--- src/mainboard/google/slippy/Kconfig | 7 +++---- src/mainboard/google/volteer/Kconfig | 7 +++---- src/mainboard/google/zork/Kconfig | 6 +++--- src/mainboard/intel/adlrvp/Kconfig | 7 +++---- src/mainboard/intel/glkrvp/Kconfig | 7 +++---- src/mainboard/intel/jasperlake_rvp/Kconfig | 7 +++---- src/mainboard/intel/kblrvp/Kconfig | 7 +++---- 26 files changed, 78 insertions(+), 97 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 75dfe3c387..48e4220e78 100644 --- a/src/mainboard/asus/h61-series/Kconfig +++ b/src/mainboard/asus/h61-series/Kconfig @@ -1,8 +1,5 @@ ## SPDX-License-Identifier: GPL-2.0-only -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_ASUS_H61_SERIES bool select HAVE_ACPI_RESUME @@ -17,6 +14,9 @@ config BOARD_ASUS_H61_SERIES if BOARD_ASUS_H61_SERIES +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config MAINBOARD_DIR default "asus/h61-series" diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index db52706386..ead4c3b5ea 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_AURON def_bool n select BOARD_ROMSIZE_KB_8192 @@ -48,6 +44,9 @@ config BOARD_GOOGLE_SAMUS if BOARD_GOOGLE_BASEBOARD_AURON +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index 15cc2c274c..d6da71c6f3 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_BELTINO def_bool n select BOARD_ROMSIZE_KB_8192 @@ -35,6 +31,9 @@ config BOARD_GOOGLE_ZAKO if BOARD_GOOGLE_BASEBOARD_BELTINO +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select VBOOT_VBNV_CMOS diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index e585f9ff3c..34d9cbabc6 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -1,6 +1,3 @@ -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BRYA_COMMON def_bool n select ALDERLAKE_A0_CONFIGURE_PMC_DESCRIPTOR @@ -65,6 +62,9 @@ config BOARD_GOOGLE_BASEBOARD_NISSA if BOARD_GOOGLE_BRYA_COMMON +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config BASEBOARD_DIR string default "brya" if BOARD_GOOGLE_BASEBOARD_BRYA diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 19627d0870..5feecf6046 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_CYAN def_bool n select BOARD_ROMSIZE_KB_8192 @@ -58,6 +54,9 @@ config BOARD_GOOGLE_WIZPIG if BOARD_GOOGLE_BASEBOARD_CYAN +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 61cb034028..07b7bf13e1 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_DEDEDE def_bool n select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768 @@ -51,6 +47,9 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2 if BOARD_GOOGLE_BASEBOARD_DEDEDE +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config BASEBOARD_DEDEDE_LAPTOP def_bool n select SYSTEM_TYPE_LAPTOP diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index bd28c4e8a8..492bcbb698 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_DELTAUR def_bool n select BOARD_ROMSIZE_KB_32768 @@ -31,6 +27,9 @@ config BOARD_GOOGLE_DELTAUR if BOARD_GOOGLE_BASEBOARD_DELTAUR +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC select GBB_FLAG_FORCE_DEV_BOOT_ALTFW diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index 3c2f4842d7..5b33ed6abc 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_DRALLION def_bool n select BOARD_ROMSIZE_KB_32768 @@ -32,6 +28,9 @@ config BOARD_GOOGLE_DRALLION if BOARD_GOOGLE_BASEBOARD_DRALLION +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS select GBB_FLAG_FORCE_DEV_SWITCH_ON select GBB_FLAG_FORCE_DEV_BOOT_USB diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 3abb1a63f8..d9b73bb100 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_FIZZ def_bool n select BOARD_ROMSIZE_KB_16384 @@ -44,6 +40,9 @@ config BOARD_GOOGLE_ENDEAVOUR if BOARD_GOOGLE_BASEBOARD_FIZZ +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config DEVICETREE default "variants/baseboard/devicetree.cb" diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index a73b4b2abd..f87f8fd7db 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_GLADOS def_bool n select BOARD_ROMSIZE_KB_16384 @@ -82,6 +78,9 @@ config BOARD_GOOGLE_SENTRY if BOARD_GOOGLE_BASEBOARD_GLADOS +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index bc9d8326ba..b2ce989bf7 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -1,13 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-or-later -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_GUYBRUSH def_bool n if BOARD_GOOGLE_BASEBOARD_GUYBRUSH +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config BOARD_SPECIFIC_OPTIONS def_bool y select AMD_SOC_CONSOLE_UART diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index d98882bd0b..00376be4da 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -1,6 +1,3 @@ -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_HATCH_COMMON def_bool n select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768 @@ -153,6 +150,9 @@ config BOARD_GOOGLE_WYVERN if BOARD_GOOGLE_HATCH_COMMON +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if !ROMSTAGE_SPD_SMBUS select EC_GOOGLE_CHROMEEC_SWITCHES diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index c05cb62f1e..0724466015 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_JECHT def_bool n select BOARD_ROMSIZE_KB_8192 @@ -30,6 +26,9 @@ config BOARD_GOOGLE_TIDUS if BOARD_GOOGLE_BASEBOARD_JECHT +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select VBOOT_VBNV_CMOS diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index 12b62476fd..0f536b4f9a 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_KAHLEE bool select SOC_AMD_STONEYRIDGE @@ -40,6 +37,9 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE if BOARD_GOOGLE_BASEBOARD_KAHLEE +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config MAINBOARD_DIR default "google/kahlee" diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 9a677bcbdd..840ce8ef77 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_OCTOPUS def_bool n select BOARD_ROMSIZE_KB_16384 @@ -101,6 +97,9 @@ config BOARD_GOOGLE_YORP if BOARD_GOOGLE_BASEBOARD_OCTOPUS +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS_WIFI_SAR bool default y if CHROMEOS diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 4a1249ab72..e65062803c 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_POPPY def_bool n select BOARD_ROMSIZE_KB_16384 @@ -102,6 +98,9 @@ config BOARD_GOOGLE_SORAKA if BOARD_GOOGLE_BASEBOARD_POPPY +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config DISABLE_HECI1_AT_PRE_BOOT default y diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 6b83bf9ddf..dfd66c07dc 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_RAMBI def_bool n select BOARD_ROMSIZE_KB_8192 @@ -96,6 +92,9 @@ config BOARD_GOOGLE_WINKY if BOARD_GOOGLE_BASEBOARD_RAMBI +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index fce9c3185b..7b65f71a86 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_REEF def_bool n select BOARD_ROMSIZE_KB_16384 @@ -46,6 +42,9 @@ config BOARD_GOOGLE_CORAL if BOARD_GOOGLE_BASEBOARD_REEF +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config DRIVER_TPM_I2C_BUS hex default 0x2 diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 6aaa7fd132..81f107261a 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -1,6 +1,3 @@ -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_SARIEN def_bool n select BOARD_ROMSIZE_KB_32768 @@ -39,6 +36,9 @@ config BOARD_GOOGLE_SARIEN if BOARD_GOOGLE_BASEBOARD_SARIEN +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS select GBB_FLAG_FORCE_DEV_SWITCH_ON select GBB_FLAG_FORCE_DEV_BOOT_USB diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index fb8ecffba2..0d0902ce9a 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_SLIPPY def_bool n select BOARD_ROMSIZE_KB_8192 @@ -37,6 +33,9 @@ config BOARD_GOOGLE_WOLF if BOARD_GOOGLE_BASEBOARD_SLIPPY +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 681192636c..eb8f17653a 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_VOLTEER def_bool n select BOARD_ROMSIZE_KB_32768 @@ -125,6 +121,9 @@ config BOARD_GOOGLE_CHRONICLER if BOARD_GOOGLE_BASEBOARD_VOLTEER +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS select CHROMEOS_CSE_BOARD_RESET_OVERRIDE select CHROMEOS_DRAM_PART_NUMBER_IN_CBI diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index ac8a58a62f..96f40e4492 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_GOOGLE_BASEBOARD_TREMBYLE def_bool n @@ -11,6 +8,9 @@ config BOARD_GOOGLE_BASEBOARD_DALBOZ if BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_AMD_COMMON_BLOCK_USE_ESPI diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig index dfc63ef868..1a9ed9e9d3 100644 --- a/src/mainboard/intel/adlrvp/Kconfig +++ b/src/mainboard/intel/adlrvp/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_INTEL_ADLRVP_COMMON def_bool n select ALDERLAKE_A0_CONFIGURE_PMC_DESCRIPTOR @@ -77,6 +73,9 @@ config BOARD_INTEL_ADLRVP_N_EXT_EC if BOARD_INTEL_ADLRVP_COMMON +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config CHROMEOS select GBB_FLAG_FORCE_DEV_SWITCH_ON select GBB_FLAG_FORCE_DEV_BOOT_USB diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index 0005de3063..a7a262fa00 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_INTEL_BASEBOARD_GLKRVP def_bool n select SOC_INTEL_GEMINILAKE @@ -19,6 +15,9 @@ config BOARD_INTEL_BASEBOARD_GLKRVP if BOARD_INTEL_BASEBOARD_GLKRVP +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config BASEBOARD_GLKRVP_LAPTOP def_bool n select SYSTEM_TYPE_LAPTOP diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig index 60cb82402c..6ae35661bf 100644 --- a/src/mainboard/intel/jasperlake_rvp/Kconfig +++ b/src/mainboard/intel/jasperlake_rvp/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_INTEL_JASPERLAKE_RVP_COMMON def_bool n select BOARD_ROMSIZE_KB_16384 @@ -37,6 +33,9 @@ config BOARD_INTEL_JASPERLAKE_RVP_EXT_EC if BOARD_INTEL_JASPERLAKE_RVP_COMMON +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config DISABLE_HECI1_AT_PRE_BOOT default y diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig index 69f49bf2b4..11d1319976 100644 --- a/src/mainboard/intel/kblrvp/Kconfig +++ b/src/mainboard/intel/kblrvp/Kconfig @@ -1,7 +1,3 @@ - -config IGNORE_IASL_MISSING_DEPENDENCY - def_bool y - config BOARD_INTEL_KBLRVP_COMMON def_bool n select BOARD_ROMSIZE_KB_16384 @@ -35,6 +31,9 @@ config BOARD_INTEL_KBLRVP11 if BOARD_INTEL_KBLRVP_COMMON +config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config DISABLE_HECI1_AT_PRE_BOOT default y -- cgit v1.2.3