Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/61477 )
Change subject: mb/**/Kconfig: Properly override `IGNORE_IASL_MISSING_DEPENDENCY` ......................................................................
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 th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/61477 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr --- M src/mainboard/asus/h61-series/Kconfig M src/mainboard/google/auron/Kconfig M src/mainboard/google/beltino/Kconfig M src/mainboard/google/brya/Kconfig M src/mainboard/google/cyan/Kconfig M src/mainboard/google/dedede/Kconfig M src/mainboard/google/deltaur/Kconfig M src/mainboard/google/drallion/Kconfig M src/mainboard/google/fizz/Kconfig M src/mainboard/google/glados/Kconfig M src/mainboard/google/guybrush/Kconfig M src/mainboard/google/hatch/Kconfig M src/mainboard/google/jecht/Kconfig M src/mainboard/google/kahlee/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/poppy/Kconfig M src/mainboard/google/rambi/Kconfig M src/mainboard/google/reef/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/slippy/Kconfig M src/mainboard/google/volteer/Kconfig M src/mainboard/google/zork/Kconfig M src/mainboard/intel/adlrvp/Kconfig M src/mainboard/intel/glkrvp/Kconfig M src/mainboard/intel/jasperlake_rvp/Kconfig M src/mainboard/intel/kblrvp/Kconfig 26 files changed, 78 insertions(+), 97 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 75dfe3c..48e4220 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 @@
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 db52706..ead4c3b 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 @@
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 15cc2c2..d6da71c 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 @@
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 e585f9f..34d9cba 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 @@
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 19627d0..5feecf6 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 @@
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 61cb034..07b7bf1 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 @@
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 bd28c4e..492bcbb 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 @@
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 3c2f484..5b33ed6 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 @@
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 3abb1a6..d9b73bb 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 @@
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 a73b4b2..f87f8fd 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 @@
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 bc9d832..b2ce989 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 d98882b..00376be 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 @@
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 c05cb62..0724466 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 @@
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 12b6247..0f536b4 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 @@
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 9a677bc..840ce8e 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 @@
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 4a1249a..e650628 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 @@
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 6b83bf9..dfd66c0 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 @@
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 fce9c31..7b65f71 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 @@
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 6aaa7fd..81f1072 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 @@
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 fb8ecff..0d0902c 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 @@
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 6811926..eb8f176 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 @@
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 ac8a58a..96f40e4 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 @@
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 dfc63ef..1a9ed9e 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 @@
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 0005de3..a7a262f 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 @@
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 60cb824..6ae3566 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 @@
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 69f49bf..11d1319 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 @@
if BOARD_INTEL_KBLRVP_COMMON
+config IGNORE_IASL_MISSING_DEPENDENCY + def_bool y + config DISABLE_HECI1_AT_PRE_BOOT default y