summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-02-13 17:53:29 -0800
committerJulius Werner <jwerner@chromium.org>2017-03-28 22:18:13 +0200
commit58c3938705af5dd96456216a17d579868e0f5b77 (patch)
treeb1531c163a2679c76395090717e835a851e027ae /src/mainboard/intel
parent73d042bd90bc8877f9bfd8b846578fe3e12444c3 (diff)
downloadcoreboot-58c3938705af5dd96456216a17d579868e0f5b77.tar.xz
vboot: Move remaining features out of vendorcode/google/chromeos
This patch attempts to finish the separation between CONFIG_VBOOT and CONFIG_CHROMEOS by moving the remaining options and code (including image generation code for things like FWID and GBB flags, which are intrinsic to vboot itself) from src/vendorcode/google/chromeos to src/vboot. Also taking this opportunity to namespace all VBOOT Kconfig options, and clean up menuconfig visibility for them (i.e. some options were visible even though they were tied to the hardware while others were invisible even though it might make sense to change them). CQ-DEPEND=CL:459088 Change-Id: I3e2e31150ebf5a96b6fe507ebeb53a41ecf88122 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/18984 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/baskingridge/Kconfig2
-rw-r--r--src/mainboard/intel/emeraldlake2/Kconfig2
-rw-r--r--src/mainboard/intel/galileo/Kconfig2
-rw-r--r--src/mainboard/intel/kblrvp/Kconfig4
-rw-r--r--src/mainboard/intel/kunimitsu/Kconfig4
-rw-r--r--src/mainboard/intel/strago/Kconfig4
-rw-r--r--src/mainboard/intel/wtm2/Kconfig2
7 files changed, 11 insertions, 9 deletions
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index df5d312127..445dbcbf22 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 9ee41e8198..7b5528ab8f 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
#select MAINBOARD_HAS_CHROMEOS
-config CHROMEOS
+config VBOOT
#select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index f31ca5e9f7..0ab682c827 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -153,7 +153,7 @@ config VBOOT_WITH_CRYPTO_SHIELD
select COLLECT_TIMESTAMPS
select I2C_TPM
select MAINBOARD_HAS_I2C_TPM_ATMEL
- select SEPARATE_VERSTAGE
+ select VBOOT_SEPARATE_VERSTAGE
select VBOOT
select VBOOT_STARTS_IN_BOOTBLOCK
select VBOOT_SOFT_REBOOT_WORKAROUND
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index 296b9225c5..6aa4ad5bdf 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -14,8 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_CHROMEOS
select GENERIC_SPD_BIN
-config CHROMEOS
- select LID_SWITCH
+config VBOOT
+ select VBOOT_LID_SWITCH
choice
prompt "TPM to USE"
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index 64a360f9f5..aec394bf86 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -34,9 +34,9 @@ config KUNIMITSU_USES_FSP2_0
endchoice
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index c7221e915d..f568891756 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -15,9 +15,9 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_INTEL_BRASWELL
select PCIEXP_L1_SUB_STATE
-config CHROMEOS
+config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
- select LID_SWITCH
+ select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS
config DYNAMIC_VNN_SUPPORT
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index f57cb2338b..76ed4bfaf2 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
+
+config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR