diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2021-04-30 15:19:24 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-05-05 11:47:15 +0000 |
| commit | c8116f6ea062dc60c6efd6a73510e69eb9b84c2d (patch) | |
| tree | ad669b7f5082d9e49a0b158bae8a57abc9772b19 /src/mainboard | |
| parent | b761903b8bbcf33b1f159b7899e0970f2eac6498 (diff) | |
| download | coreboot-c8116f6ea062dc60c6efd6a73510e69eb9b84c2d.tar.gz coreboot-c8116f6ea062dc60c6efd6a73510e69eb9b84c2d.tar.bz2 coreboot-c8116f6ea062dc60c6efd6a73510e69eb9b84c2d.zip | |
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>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-q35/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/beltino/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/baskingridge/Makefile.inc | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 9b990ce908cb..b1b2f458378d 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/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 diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index f0fcff016e38..6f072fef3a36 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/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 diff --git a/src/mainboard/google/beltino/Makefile.inc b/src/mainboard/google/beltino/Makefile.inc index e12aa15e6954..77edc30b8e8b 100644 --- a/src/mainboard/google/beltino/Makefile.inc +++ b/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 diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc index 9e605009dac7..c69f7c8c5fcf 100644 --- a/src/mainboard/intel/baskingridge/Makefile.inc +++ b/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 |