soc/{amd/stoneyridge,intel}: Don't select VBOOT_SEPARATE_VERSTAGE

Now the bootblock is not limited to 64K so integrating vboot into the
bootblock reduces the binary size. intel/apl is an exception since the
bootblock size is limited to 32K.

Change-Id: I5e02961183b5bcc37365458a3b10342e5bc2b525
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52788
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

src/soc/amd/stoneyridge/Kconfig

@@ -79,7 +79,6 @@ config AMD_SOC_PACKAGE
 	default "FT4" if AMD_APU_PKG_FT4
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS
 	select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH

src/soc/intel/alderlake/Kconfig

@@ -307,7 +307,6 @@ config SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL
 	default 0x7fff
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS

src/soc/intel/broadwell/Kconfig

@@ -18,7 +18,6 @@ config BROADWELL_VBOOT_IN_BOOTBLOCK
 	bool "Start verstage in bootblock"
 	default y
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select VBOOT_SEPARATE_VERSTAGE
 	help
 	  Broadwell can either start verstage in a separate stage
 	  right after the bootblock has run or it can start it

src/soc/intel/cannonlake/Kconfig

@@ -267,7 +267,6 @@ config SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL
 	default 0xc35
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS

src/soc/intel/elkhartlake/Kconfig

@@ -182,7 +182,6 @@ config SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL
 	default 0x7fff
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS

src/soc/intel/icelake/Kconfig

@@ -171,7 +171,6 @@ config SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL
 	default 0xc35
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS

src/soc/intel/jasperlake/Kconfig

@@ -182,7 +182,6 @@ config VBT_DATA_SIZE_KB
 	default 9
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS

src/soc/intel/skylake/Kconfig

@@ -114,7 +114,6 @@ config CPU_INTEL_NUM_FIT_ENTRIES
 	default 10
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS

src/soc/intel/tigerlake/Kconfig

@@ -229,7 +229,6 @@ config VBT_DATA_SIZE_KB
 	default 9
 
 config VBOOT
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS