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>

14 files changed, 34 insertions, 29 deletions

diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig
index e5849f020a..e2f97e4ab2 100644
--- a/src/soc/broadcom/cygnus/Kconfig
+++ b/src/soc/broadcom/cygnus/Kconfig
@@ -28,10 +28,10 @@ config SOC_BROADCOM_CYGNUS
 
 if SOC_BROADCOM_CYGNUS
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select SEPARATE_VERSTAGE
-	select RETURN_FROM_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
+	select VBOOT_RETURN_FROM_VERSTAGE
 
 config CONSOLE_SERIAL_UART_ADDRESS
 	hex
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 234e2900b9..ca8f5d0829 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -70,7 +70,9 @@ config CPU_SPECIFIC_OPTIONS
 
 config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC
-	select SEPARATE_VERSTAGE
+
+config VBOOT
+	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_OPROM_MATTERS
 	select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
diff --git a/src/soc/intel/quark/romstage/fsp1_1.c b/src/soc/intel/quark/romstage/fsp1_1.c
index f715f43425..6ce2079256 100644
--- a/src/soc/intel/quark/romstage/fsp1_1.c
+++ b/src/soc/intel/quark/romstage/fsp1_1.c
@@ -119,7 +119,7 @@ void soc_memory_init_params(struct romstage_params *params,
 		printk(BIOS_SPEW, "| coreboot stack    |\n");
 		printk(BIOS_SPEW, "+-------------------+ 0x%p",
 			_car_stack_start);
-		if (IS_ENABLED(CONFIG_SEPARATE_VERSTAGE)) {
+		if (IS_ENABLED(CONFIG_VBOOT_SEPARATE_VERSTAGE)) {
 			printk(BIOS_SPEW, "\n");
 			printk(BIOS_SPEW, "| vboot data        |\n");
 			printk(BIOS_SPEW, "+-------------------+ 0x%08x",
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index b7c5552a7a..8ac7263c89 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -87,8 +87,10 @@ config USE_FSP1_1_DRIVER
 
 config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC
-	select SEPARATE_VERSTAGE
-	select VBOOT_EC_SLOW_UPDATE if EC_GOOGLE_CHROMEEC
+
+config VBOOT
+	select VBOOT_EC_SLOW_UPDATE if VBOOT_EC_SOFTWARE_SYNC
+	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_OPROM_MATTERS
 	select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
diff --git a/src/soc/marvell/armada38x/Kconfig b/src/soc/marvell/armada38x/Kconfig
index ed8cbe8100..20f9d09c89 100644
--- a/src/soc/marvell/armada38x/Kconfig
+++ b/src/soc/marvell/armada38x/Kconfig
@@ -7,13 +7,15 @@ config SOC_MARVELL_ARMADA38X
 	select ARCH_RAMSTAGE_ARMV7
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
-	select RETURN_FROM_VERSTAGE
 	select BOOTBLOCK_CUSTOM
 	select GENERIC_UDELAY
 	select UART_OVERRIDE_REFCLK
 
 if SOC_MARVELL_ARMADA38X
 
+config VBOOT
+	select VBOOT_RETURN_FROM_VERSTAGE
+
 config BOOTBLOCK_CPU_INIT
 	string
 	default "soc/marvell/armada38x/bootblock.c"
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index cdd8597de8..6f9b6aab32 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -28,7 +28,7 @@ config SOC_MARVELL_BG4CD
 
 if SOC_MARVELL_BG4CD
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
 
 endif
diff --git a/src/soc/marvell/mvmap2315/Kconfig b/src/soc/marvell/mvmap2315/Kconfig
index 45e03c1e77..072f4eee01 100644
--- a/src/soc/marvell/mvmap2315/Kconfig
+++ b/src/soc/marvell/mvmap2315/Kconfig
@@ -31,8 +31,7 @@ config SOC_MARVELL_MVMAP2315
 
 if SOC_MARVELL_MVMAP2315
 
-config CHROMEOS
-	select VBOOT
+config VBOOT
 	select VBOOT_STARTS_IN_ROMSTAGE
 
 config CONSOLE_SERIAL_MVMAP2315_UART_ADDRESS
diff --git a/src/soc/mediatek/mt8173/Kconfig b/src/soc/mediatek/mt8173/Kconfig
index 7558ad18d2..a367470ed6 100644
--- a/src/soc/mediatek/mt8173/Kconfig
+++ b/src/soc/mediatek/mt8173/Kconfig
@@ -17,10 +17,10 @@ config SOC_MEDIATEK_MT8173
 
 if SOC_MEDIATEK_MT8173
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_OPROM_MATTERS
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select SEPARATE_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
 
 config MEMORY_TEST
 	bool
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index fdbbc7fc6c..cd753f42ae 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -16,10 +16,10 @@ config SOC_NVIDIA_TEGRA124
 
 if SOC_NVIDIA_TEGRA124
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_OPROM_MATTERS
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select SEPARATE_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
 
 config TEGRA124_MODEL_TD570D
 	bool "TD570D"
diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig
index 880f1996f0..30a23ef394 100644
--- a/src/soc/nvidia/tegra210/Kconfig
+++ b/src/soc/nvidia/tegra210/Kconfig
@@ -17,9 +17,9 @@ config SOC_NVIDIA_TEGRA210
 
 if SOC_NVIDIA_TEGRA210
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select SEPARATE_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_OPROM_MATTERS
 
 config MAINBOARD_DO_DSI_INIT
diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig
index d0c1fbd4f0..b0d3f07ad2 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/src/soc/qualcomm/ipq40xx/Kconfig
@@ -12,10 +12,10 @@ config SOC_QC_IPQ40XX
 
 if SOC_QC_IPQ40XX
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select RETURN_FROM_VERSTAGE
-	select SEPARATE_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
+	select VBOOT_RETURN_FROM_VERSTAGE
 	select VBOOT_VBNV_FLASH
 
 config IPQ_QFN_PART
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 13977e5cba..54300ebf2b 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -11,11 +11,11 @@ config SOC_QC_IPQ806X
 
 if SOC_QC_IPQ806X
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_FLASH
-	select SEPARATE_VERSTAGE
-	select RETURN_FROM_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
+	select VBOOT_RETURN_FROM_VERSTAGE
 
 config MBN_ENCAPSULATION
 	depends on USE_BLOBS
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index ea34bb9130..19e52b64d9 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -31,11 +31,11 @@ config SOC_ROCKCHIP_RK3288
 
 if SOC_ROCKCHIP_RK3288
 
-config CHROMEOS
+config VBOOT
 	select VBOOT_OPROM_MATTERS
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select SEPARATE_VERSTAGE
-	select RETURN_FROM_VERSTAGE
+	select VBOOT_SEPARATE_VERSTAGE
+	select VBOOT_RETURN_FROM_VERSTAGE
 
 config PMIC_BUS
 	int
diff --git a/src/soc/rockchip/rk3399/Kconfig b/src/soc/rockchip/rk3399/Kconfig
index b4017c8856..65b31d523e 100644
--- a/src/soc/rockchip/rk3399/Kconfig
+++ b/src/soc/rockchip/rk3399/Kconfig
@@ -14,9 +14,9 @@ config SOC_ROCKCHIP_RK3399
 
 if SOC_ROCKCHIP_RK3399
 
-config CHROMEOS
-	select RETURN_FROM_VERSTAGE
-	select SEPARATE_VERSTAGE
+config VBOOT
+	select VBOOT_SEPARATE_VERSTAGE
+	select VBOOT_RETURN_FROM_VERSTAGE
 	select VBOOT_OPROM_MATTERS
 	select VBOOT_STARTS_IN_BOOTBLOCK