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>
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 9b990ce..b1b2f45 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -19,7 +19,6 @@
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
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index f0fcff0..6f072fe 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -20,7 +20,6 @@
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
diff --git a/src/mainboard/google/beltino/Makefile.inc b/src/mainboard/google/beltino/Makefile.inc
index e12aa15..77edc30 100644
--- a/src/mainboard/google/beltino/Makefile.inc
+++ b/src/mainboard/google/beltino/Makefile.inc
@@ -4,7 +4,7 @@
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
diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc
index 9e60500..c69f7c8 100644
--- a/src/mainboard/intel/baskingridge/Makefile.inc
+++ b/src/mainboard/intel/baskingridge/Makefile.inc
@@ -4,4 +4,4 @@
romstage-y += chromeos.c
ramstage-y += chromeos.c
-verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
+verstage-y += chromeos.c
diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig
index 06883e4..cd3e27c 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -16,7 +16,6 @@
config VBOOT
select VBOOT_STARTS_IN_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
config CBFS_SIZE
hex
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
index e3f9aec..61c201a 100644
--- a/src/northbridge/intel/haswell/Kconfig
+++ b/src/northbridge/intel/haswell/Kconfig
@@ -14,7 +14,6 @@
bool "Start verstage in bootblock"
default y
select VBOOT_STARTS_IN_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
help
Haswell can either start verstage in a separate stage
right after the bootblock has run or it can start it
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index 484b694..2af4424 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -17,8 +17,6 @@
config VBOOT
select VBOOT_STARTS_IN_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
-
config NORTHBRIDGE_INTEL_SUBTYPE_I945GC
def_bool n
config NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/northbridge/intel/ironlake/Kconfig b/src/northbridge/intel/ironlake/Kconfig
index 0d58704..4fe5dd173 100644
--- a/src/northbridge/intel/ironlake/Kconfig
+++ b/src/northbridge/intel/ironlake/Kconfig
@@ -14,7 +14,6 @@
config VBOOT
select VBOOT_MUST_REQUEST_DISPLAY
select VBOOT_STARTS_IN_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
# CPU is reset without platform/TPM during romstage
select TPM_STARTUP_IGNORE_POSTINIT
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 215560f..501ca9f 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -21,7 +21,6 @@
bool "Start verstage in bootblock"
default y
select VBOOT_STARTS_IN_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
help
Sandy Bridge can either start verstage in a separate stage
right after the bootblock has run or it can start it
diff --git a/src/southbridge/intel/lynxpoint/Makefile.inc b/src/southbridge/intel/lynxpoint/Makefile.inc
index 9ffd764..2923035 100644
--- a/src/southbridge/intel/lynxpoint/Makefile.inc
+++ b/src/southbridge/intel/lynxpoint/Makefile.inc
@@ -41,10 +41,10 @@
romstage-y += lp_gpio.c
ramstage-y += lp_gpio.c
smm-y += lp_gpio.c
-verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += lp_gpio.c
+verstage-y += lp_gpio.c
endif
-verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += pmutil.c
+verstage-y += pmutil.c
CPPFLAGS_common += -I$(src)/southbridge/intel/lynxpoint/include