[coreboot-gerrit] Change in coreboot[master]: qemu-i440fx/qemu-q35: Fix default fmap

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36707 )

Change subject: qemu-i440fx/qemu-q35: Fix default fmap
......................................................................

qemu-i440fx/qemu-q35: Fix default fmap

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 run.

Change-Id: I90414e2cc7e4c4a6ad67014bd4a7f9c8ff4da389
Signed-off-by: Patrick Rudolph 
---
M src/mainboard/emulation/qemu-i440fx/Kconfig
M src/mainboard/emulation/qemu-q35/Kconfig
2 files changed, 8 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/36707/1

diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 05246b6..8632ef6 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -25,9 +25,13 @@
    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 a86e844..8b97495 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -28,9 +28,13 @@
    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