UPSTREAM: nb/intel/nehalem: Start VBOOT in bootblock with a separate verstage

Tested on Lenovo Thinkpad X201, selects slot or recovery just fine.

BUG=none
BRANCH=none
TEST=none

Change-Id: If3292792344effaec9c8342a010b7d60ad32cfab
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 2ea4efeefa72fc31934b0e4e27a80f9d81ddd961
Original-Change-Id: Ia2b2f2b95510388599266264eaed0d64ce9b6ec5
Original-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/35952
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Original-Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/1858736
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig
index ba9616d..a88d4c9 100644
--- a/src/northbridge/intel/nehalem/Kconfig
+++ b/src/northbridge/intel/nehalem/Kconfig
@@ -27,7 +27,8 @@
 
 config VBOOT
 	select VBOOT_MUST_REQUEST_DISPLAY
-	select VBOOT_STARTS_IN_ROMSTAGE
+	select VBOOT_STARTS_IN_BOOTBLOCK
+	select VBOOT_SEPARATE_VERSTAGE
 
 config MMCONF_BUS_NUMBER
 	int