Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/78207?usp=email )
Change subject: mb/{google, intel}: Enable VBOOT_LID_SWITCH by default ......................................................................
mb/{google, intel}: Enable VBOOT_LID_SWITCH by default
Remove mainboard-specific overrides to VBOOT_LID_SWITCH config. VBOOT_LID_SWITCH is now enabled by default.
Platforms that wish to disable VBOOT_LID_SWITCH should override the config from mainboard Kconfig.
TEST=Ensure VBOOT_LID_SWITCH is enabled for google/rex, but not applicable for Ovis (aka Chromeosbox).
Change-Id: I922c04e0fa0675090cea7c7b3f4e2275eb70f523 Signed-off-by: Subrata Banik subratabanik@google.com --- M src/mainboard/google/asurada/Kconfig M src/mainboard/google/auron/Kconfig M src/mainboard/google/beltino/Kconfig M src/mainboard/google/brya/Kconfig M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/cherry/Kconfig M src/mainboard/google/corsola/Kconfig M src/mainboard/google/cyan/Kconfig M src/mainboard/google/dedede/Kconfig M src/mainboard/google/drallion/Kconfig M src/mainboard/google/eve/Kconfig M src/mainboard/google/fizz/Kconfig M src/mainboard/google/foster/Kconfig M src/mainboard/google/gale/Kconfig M src/mainboard/google/geralt/Kconfig M src/mainboard/google/glados/Kconfig M src/mainboard/google/gru/Kconfig M src/mainboard/google/guybrush/Kconfig M src/mainboard/google/hatch/Kconfig M src/mainboard/google/herobrine/Kconfig M src/mainboard/google/jecht/Kconfig M src/mainboard/google/kahlee/Kconfig M src/mainboard/google/kukui/Kconfig M src/mainboard/google/link/Kconfig M src/mainboard/google/mistral/Kconfig M src/mainboard/google/myst/Kconfig M src/mainboard/google/nyan/Kconfig M src/mainboard/google/nyan_big/Kconfig M src/mainboard/google/nyan_blaze/Kconfig M src/mainboard/google/oak/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/parrot/Kconfig M src/mainboard/google/poppy/Kconfig M src/mainboard/google/puff/Kconfig M src/mainboard/google/reef/Kconfig M src/mainboard/google/rex/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/skyrim/Kconfig M src/mainboard/google/slippy/Kconfig M src/mainboard/google/smaug/Kconfig M src/mainboard/google/storm/Kconfig M src/mainboard/google/stout/Kconfig M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/veyron/Kconfig M src/mainboard/google/veyron_mickey/Kconfig M src/mainboard/google/veyron_rialto/Kconfig M src/mainboard/google/volteer/Kconfig M src/mainboard/google/zork/Kconfig M src/mainboard/intel/adlrvp/Kconfig M src/mainboard/intel/coffeelake_rvp/Kconfig M src/mainboard/intel/glkrvp/Kconfig M src/mainboard/intel/jasperlake_rvp/Kconfig M src/mainboard/intel/kblrvp/Kconfig M src/mainboard/intel/kunimitsu/Kconfig M src/mainboard/intel/mtlrvp/Kconfig M src/mainboard/intel/shadowmountain/Kconfig M src/mainboard/intel/strago/Kconfig M src/mainboard/intel/tglrvp/Kconfig M src/security/vboot/Kconfig 59 files changed, 84 insertions(+), 38 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/78207/1
diff --git a/src/mainboard/google/asurada/Kconfig b/src/mainboard/google/asurada/Kconfig index 52aefa4..aae8817 100644 --- a/src/mainboard/google/asurada/Kconfig +++ b/src/mainboard/google/asurada/Kconfig @@ -39,6 +39,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/asurada"
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index e7ba578..e830668 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -48,7 +48,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index a2c435b..5d56e9a 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -34,6 +34,9 @@ config VBOOT select VBOOT_VBNV_CMOS
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/beltino"
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index c400af6..5898516 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -311,7 +311,6 @@
config VBOOT select VBOOT_EARLY_EC_SYNC if !BOARD_GOOGLE_BASEBOARD_NISSA - select VBOOT_LID_SWITCH
config DIMM_SPD_SIZE default 512 diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 1eb81ee..6b151db 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -26,6 +26,9 @@ config VBOOT select VBOOT_VBNV_CMOS
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/butterfly"
diff --git a/src/mainboard/google/cherry/Kconfig b/src/mainboard/google/cherry/Kconfig index a99d7a5..41a3d45 100644 --- a/src/mainboard/google/cherry/Kconfig +++ b/src/mainboard/google/cherry/Kconfig @@ -38,6 +38,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/cherry"
diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig index cd2ae8f..04697f3 100644 --- a/src/mainboard/google/corsola/Kconfig +++ b/src/mainboard/google/corsola/Kconfig @@ -48,6 +48,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_MEDIATEK_MT8186 diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index a162e3b..11c93f9 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -57,7 +57,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_VBNV_FLASH
config DISPLAY_SPD_DATA diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 02087ac..99e0fd5 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -61,7 +61,6 @@ select GBB_FLAG_FORCE_MANUAL_RECOVERY select HAS_RECOVERY_MRC_CACHE select VBOOT_EARLY_EC_SYNC - select VBOOT_LID_SWITCH
config CHROMEOS_WIFI_SAR bool "Enable SAR options for ChromeOS build" diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index 6d571dd..ffac560 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -88,7 +88,6 @@
config VBOOT select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
config FMDFILE default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/default.fmd" if !CHROMEOS diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index 0579c0d..241ed70 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -31,7 +31,6 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
config CHROMEOS select DSAR_ENABLE diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 8b7811c..e8bf258 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -51,6 +51,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE
+config VBOOT_LID_SWITCH + default n + config DRIVER_TPM_SPI_BUS default 0x1
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig index 6a2d28e..2efa09f 100644 --- a/src/mainboard/google/foster/Kconfig +++ b/src/mainboard/google/foster/Kconfig @@ -17,6 +17,9 @@ config VBOOT select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/foster"
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig index 76ecb65..d1e1360 100644 --- a/src/mainboard/google/gale/Kconfig +++ b/src/mainboard/google/gale/Kconfig @@ -22,6 +22,9 @@ select VBOOT_DISABLE_DEV_ON_RECOVERY select VBOOT_WIPEOUT_SUPPORTED
+config VBOOT_LID_SWITCH + default n + config BOARD_VARIANT_DK01 bool "Build an image for DK01" default n diff --git a/src/mainboard/google/geralt/Kconfig b/src/mainboard/google/geralt/Kconfig index 54c51d8..e024cf7 100644 --- a/src/mainboard/google/geralt/Kconfig +++ b/src/mainboard/google/geralt/Kconfig @@ -13,6 +13,9 @@ select VBOOT_VBNV_FLASH select EC_GOOGLE_CHROMEEC_SWITCHES
+config VBOOT_LID_SWITCH + default n + config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_MEDIATEK_MT8188 diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 631d90d..e97bbdd 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -85,7 +85,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH
config MAINBOARD_DIR default "google/glados" diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index 837b06d..dc88eb4 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -71,6 +71,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/gru"
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index 7f233be..c29b7d1 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -60,7 +60,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_SEPARATE_VERSTAGE
config VBOOT_STARTS_BEFORE_BOOTBLOCK diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index c674036..a1fc329 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -96,7 +96,6 @@ select GBB_FLAG_FORCE_DEV_SWITCH_ON select GBB_FLAG_FORCE_MANUAL_RECOVERY select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
config CHROMEOS_WIFI_SAR bool "Enable SAR options for ChromeOS build" diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig index a95ac06..c505237 100644 --- a/src/mainboard/google/herobrine/Kconfig +++ b/src/mainboard/google/herobrine/Kconfig @@ -37,6 +37,9 @@ select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_SENOR select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_SENOR
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/herobrine"
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 4cbad81..75f1a2c 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -29,6 +29,9 @@ config VBOOT select VBOOT_VBNV_CMOS
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/jecht"
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index 7b4fa10..906de42 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -114,7 +114,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH
config VBOOT_VBNV_OFFSET hex diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig index f5ad431..14e9d9d 100644 --- a/src/mainboard/google/kukui/Kconfig +++ b/src/mainboard/google/kukui/Kconfig @@ -77,6 +77,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config BOARD_SPECIFIC_OPTIONS def_bool y select RTC diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index 75a15b4..79d2d01 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -23,7 +23,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/mistral/Kconfig b/src/mainboard/google/mistral/Kconfig index 9bd8af2..f9feaa3 100644 --- a/src/mainboard/google/mistral/Kconfig +++ b/src/mainboard/google/mistral/Kconfig @@ -23,6 +23,9 @@ select VBOOT_NO_BOARD_SUPPORT select GBB_FLAG_FORCE_DEV_SWITCH_ON
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/mistral"
diff --git a/src/mainboard/google/myst/Kconfig b/src/mainboard/google/myst/Kconfig index fbb3687..d50a549 100644 --- a/src/mainboard/google/myst/Kconfig +++ b/src/mainboard/google/myst/Kconfig @@ -76,7 +76,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_SEPARATE_VERSTAGE
config VBOOT_STARTS_BEFORE_BOOTBLOCK diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index 0690f01..cf55b59 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -20,6 +20,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/nyan"
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 04acaed..6e05476 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -22,6 +22,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/nyan_big"
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 9f4edac..f68adef 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -22,6 +22,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/nyan_blaze"
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig index 900b04b..3b34936 100644 --- a/src/mainboard/google/oak/Kconfig +++ b/src/mainboard/google/oak/Kconfig @@ -31,6 +31,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/oak"
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 88e37ba..28ad467 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -107,7 +107,6 @@ config CHROMEOS select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
config MAINBOARD_DIR default "google/octopus" diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 4d8ce2b..4841be5 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -27,6 +27,9 @@ config VBOOT select VBOOT_VBNV_CMOS
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/parrot"
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 34fcfa1..4669b2a 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -216,7 +216,6 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
config UART_FOR_CONSOLE int diff --git a/src/mainboard/google/puff/Kconfig b/src/mainboard/google/puff/Kconfig index ee2b2fa..e30e573 100644 --- a/src/mainboard/google/puff/Kconfig +++ b/src/mainboard/google/puff/Kconfig @@ -98,7 +98,6 @@ select GBB_FLAG_FORCE_DEV_SWITCH_ON select GBB_FLAG_FORCE_MANUAL_RECOVERY select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH select CHROMEOS_CSE_BOARD_RESET_OVERRIDE
config CHROMEOS_WIFI_SAR diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index fb02631..651ce9e 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -60,7 +60,6 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
config MAINBOARD_DIR default "google/reef" diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index e2c730e..bfb41f8 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -198,8 +198,8 @@ select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if CHROMEOS select HAVE_SPD_IN_CBFS
-config VBOOT - select VBOOT_LID_SWITCH if BOARD_GOOGLE_BASEBOARD_REX +config VBOOT_LID_SWITCH + default n if BOARD_GOOGLE_MODEL_OVIS
config UART_FOR_CONSOLE int diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index c772d4a..8bc2922 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -99,7 +99,6 @@
config VBOOT select HAS_RECOVERY_MRC_CACHE - select VBOOT_LID_SWITCH
# Override the default variant behavior, since the data.vbt is the same # for all variants. diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig index 4e9ae98..44c1c19 100644 --- a/src/mainboard/google/skyrim/Kconfig +++ b/src/mainboard/google/skyrim/Kconfig @@ -164,7 +164,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_SEPARATE_VERSTAGE
config VBOOT_STARTS_BEFORE_BOOTBLOCK diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 8b4c67c..e7e482d 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -36,7 +36,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig index e57da4a..38dbb83 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -24,6 +24,9 @@ select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/smaug"
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index c5ce74b..4681392 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -20,6 +20,9 @@ select VBOOT_DISABLE_DEV_ON_RECOVERY select VBOOT_WIPEOUT_SUPPORTED
+config VBOOT_LID_SWITCH + default n + config BOARD_VARIANT_AP148 bool "pick this to build an image for ap148" default n diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index d6ed754..1df1194 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -25,6 +25,9 @@ config VBOOT select VBOOT_VBNV_CMOS
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/stout"
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig index 028dc2b..086d073 100644 --- a/src/mainboard/google/trogdor/Kconfig +++ b/src/mainboard/google/trogdor/Kconfig @@ -54,6 +54,9 @@ select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_BUBS select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/trogdor"
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig index 0e543e1..a8bc188 100644 --- a/src/mainboard/google/veyron/Kconfig +++ b/src/mainboard/google/veyron/Kconfig @@ -52,6 +52,9 @@ config VBOOT select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/veyron"
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 2c46965..68bb0d4 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -17,6 +17,9 @@ config VBOOT select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/veyron_mickey"
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 916d8a6..0591e41 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -17,6 +17,9 @@ config VBOOT select VBOOT_VBNV_FLASH
+config VBOOT_LID_SWITCH + default n + config MAINBOARD_DIR default "google/veyron_rialto"
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 202d8f1..637f247 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -147,7 +147,6 @@ select GBB_FLAG_FORCE_MANUAL_RECOVERY select HAS_RECOVERY_MRC_CACHE select VBOOT_EARLY_EC_SYNC - select VBOOT_LID_SWITCH
config VBOOT_GSCVD bool diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index de7888b..ab800fb 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -148,7 +148,6 @@ # selected by default as PSP verstage required for booting at present time default y select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_STARTS_BEFORE_BOOTBLOCK
config VBOOT_VBNV_OFFSET diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig index 425fe69..35d4d8d 100644 --- a/src/mainboard/intel/adlrvp/Kconfig +++ b/src/mainboard/intel/adlrvp/Kconfig @@ -179,7 +179,6 @@ endchoice
config VBOOT - select VBOOT_LID_SWITCH select VBOOT_MOCK_SECDATA if BOARD_INTEL_ADLRVP_P_EXT_EC || BOARD_INTEL_ADLRVP_N_EXT_EC select EC_GOOGLE_CHROMEEC_SWITCHES if ADL_CHROME_EC select VBOOT_EARLY_EC_SYNC if BOARD_INTEL_ADLRVP_M_EXT_EC || BOARD_INTEL_ADLRVP_N_EXT_EC diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index bcb5aaf..cfadb3d 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -109,6 +109,5 @@ default 512
config VBOOT - select VBOOT_LID_SWITCH select VBOOT_MOCK_SECDATA endif diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index c2584f3..0ab96a5 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -38,12 +38,14 @@
config CHROMEOS select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC - select VBOOT_LID_SWITCH if GLK_CHROME_EC
config VBOOT select HAS_RECOVERY_MRC_CACHE select EC_GOOGLE_CHROMEEC_SWITCHES if GLK_CHROME_EC
+config VBOOT_LID_SWITCH + default n if !GLK_CHROME_EC + config MAINBOARD_DIR default "intel/glkrvp"
diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig index 2d72f95..b435a73 100644 --- a/src/mainboard/intel/jasperlake_rvp/Kconfig +++ b/src/mainboard/intel/jasperlake_rvp/Kconfig @@ -68,7 +68,6 @@ select HAS_RECOVERY_MRC_CACHE
config VBOOT - select VBOOT_LID_SWITCH select VBOOT_MOCK_SECDATA if !MAINBOARD_HAS_TPM2
config UART_FOR_CONSOLE diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig index a381897..d08243f 100644 --- a/src/mainboard/intel/kblrvp/Kconfig +++ b/src/mainboard/intel/kblrvp/Kconfig @@ -34,9 +34,6 @@ config DISABLE_HECI1_AT_PRE_BOOT default y
-config VBOOT - select VBOOT_LID_SWITCH - config MAINBOARD_DIR default "intel/kblrvp"
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 476a1b9..34ae7c0 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -26,7 +26,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH
config MAINBOARD_DIR default "intel/kunimitsu" diff --git a/src/mainboard/intel/mtlrvp/Kconfig b/src/mainboard/intel/mtlrvp/Kconfig index 8a59085..883721b 100644 --- a/src/mainboard/intel/mtlrvp/Kconfig +++ b/src/mainboard/intel/mtlrvp/Kconfig @@ -115,7 +115,6 @@ endchoice
config VBOOT - select VBOOT_LID_SWITCH select EC_GOOGLE_CHROMEEC_SWITCHES if MTL_CHROME_EC
config UART_FOR_CONSOLE diff --git a/src/mainboard/intel/shadowmountain/Kconfig b/src/mainboard/intel/shadowmountain/Kconfig index 0d8ad2b..f599ac2 100644 --- a/src/mainboard/intel/shadowmountain/Kconfig +++ b/src/mainboard/intel/shadowmountain/Kconfig @@ -36,7 +36,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select HAS_RECOVERY_MRC_CACHE select VBOOT_EARLY_EC_SYNC
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 5cd7880..f8b2471 100644 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -20,7 +20,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH select VBOOT_VBNV_FLASH
config MAINBOARD_DIR diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig index b8110dd..243c5b8 100644 --- a/src/mainboard/intel/tglrvp/Kconfig +++ b/src/mainboard/intel/tglrvp/Kconfig @@ -77,9 +77,6 @@ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC endchoice
-config VBOOT - select VBOOT_LID_SWITCH - config UART_FOR_CONSOLE int default 2 diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index a2af5d2..2f9603c 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -176,7 +176,7 @@
config VBOOT_LID_SWITCH bool - default n + default y help Whether this platform has a lid switch. If it does, vboot will not decrement try counters for boot failures if the lid is closed.