summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Rudolph <siro@das-labor.org>2019-11-10 16:48:23 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-12 08:25:45 +0000
commit9764bc126ea8718cdc723714d8355e51e71aa65f (patch)
treeb4b80ca15dfeb37213001b967d7f67c119a083b7 /src
parentb7e8505d96236e73db2d0440f1a5889cdba18697 (diff)
downloadcoreboot-9764bc126ea8718cdc723714d8355e51e71aa65f.tar.xz
mb/*: Fix default fmap with VBOOT_SLOTS_RW_A enabled
Don't select the VBOOT fmap as default if VBOOT is disabled. Fixes a regression introduced by f8251b98 "mb/emulation/qemu: Add VBOOT support" where the default Kconfig settings wouldn't allow the qemu boards to run. Also fix the Supermicro x11-lga1151 series boards. Change-Id: I90414e2cc7e4c4a6ad67014bd4a7f9c8ff4da389 Signed-off-by: Patrick Rudolph <siro@das-labor.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36707 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/emulation/qemu-i440fx/Kconfig4
-rw-r--r--src/mainboard/emulation/qemu-q35/Kconfig4
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/Kconfig4
3 files changed, 12 insertions, 0 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 05246b6d6d..8632ef67c2 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -25,9 +25,13 @@ config VBOOT
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
select GBB_FLAG_DISABLE_FWMP
+if VBOOT
+
config VBOOT_SLOTS_RW_A
default y
+endif
+
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index a86e844044..8b97495180 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -28,9 +28,13 @@ config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
+if VBOOT
+
config VBOOT_SLOTS_RW_A
default y
+endif
+
config VBOOT_VBNV_OFFSET
hex
default 0x2c
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index ea0214ad01..5a99f7aac5 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -47,9 +47,13 @@ config VBOOT
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
select GBB_FLAG_DISABLE_FWMP
+if VBOOT
+
config VBOOT_SLOTS_RW_AB
default y
+endif
+
config VBOOT_VBNV_OFFSET
hex
default 0x2a