nb/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.

Change-Id: Ic92ecf8068f327a893d20924685ce571752d379f
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52787
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/emulation/qemu-i440fx/Kconfig

@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
 config VBOOT
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_VBNV_CMOS
 	select VBOOT_NO_BOARD_SUPPORT
 	select GBB_FLAG_DISABLE_LID_SHUTDOWN

src/mainboard/emulation/qemu-q35/Kconfig

@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
 config VBOOT
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
-	select VBOOT_SEPARATE_VERSTAGE
 	select VBOOT_VBNV_CMOS
 	select VBOOT_NO_BOARD_SUPPORT if !CHROMEOS
 	select GBB_FLAG_DISABLE_LID_SHUTDOWN

src/mainboard/google/beltino/Makefile.inc

@@ -4,7 +4,7 @@ bootblock-y += bootblock.c
 
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
-verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
+verstage-y += chromeos.c
 ramstage-y += lan.c
 
 smm-y += variants/$(VARIANT_DIR)/led.c

src/mainboard/intel/baskingridge/Makefile.inc

@@ -4,4 +4,4 @@ romstage-y += gpio.c
 
 romstage-y += chromeos.c
 ramstage-y += chromeos.c
-verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
+verstage-y += chromeos.c