mb/qemu-{i440fx,q35}: reduce default ROM size to 8 MiB

By default, QEMU bails when trying to use bigger images mounted with
'-drive if=pflash', which is required to make use of writable flash
introduced in CB:82555. This changes both default size in Kconfig as
well as FMAP layouts.

Since QEMU 5.0.0 it is possible to change the limit of firmware size
with `max-fw-size` machine configuration option, up to 16 MiB, as bigger
sizes would overlap with IO APIC memory range. Default is still 8 MiB,
so it makes sense to have identical default in coreboot.

Error thrown by QEMU when trying to use too big ROM:

qemu-system-x86_64: combined size of system firmware exceeds 8388608 bytes

Change-Id: If36cb754a8e75e23bce49ff568dd88e5db279bb8
Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82639
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 842c053185..6d6181c5bb 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_PIRQ_TABLE
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_4096 if !VBOOT
-	select BOARD_ROMSIZE_KB_16384 if VBOOT
+	select BOARD_ROMSIZE_KB_8192 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
 	select HAVE_ASAN_IN_ROMSTAGE
@@ -52,7 +52,7 @@ config VBOOT_SLOTS_RW_A
 endif
 
 config FMDFILE
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-8M.fmd" if VBOOT_SLOTS_RW_A
 
 config VBOOT_VBNV_OFFSET
 	hex
diff --git a/src/mainboard/emulation/qemu-i440fx/vboot-rwa-16M.fmd b/src/mainboard/emulation/qemu-i440fx/vboot-rwa-8M.fmd
index 0d2c9da297..55a38b79a9 100644
--- a/src/mainboard/emulation/qemu-i440fx/vboot-rwa-16M.fmd
+++ b/src/mainboard/emulation/qemu-i440fx/vboot-rwa-8M.fmd
@@ -1,8 +1,8 @@
-FLASH@0xff000000 0x1000000 {
-	SI_BIOS 0x1000000 {
-		RW_SECTION_A 0x7c0000 {
+FLASH@0xff800000 0x800000 {
+	SI_BIOS 0x800000 {
+		RW_SECTION_A 0x3c0000 {
 			VBLOCK_A 0x10000
-			FW_MAIN_A(CBFS) 0x74ffc0
+			FW_MAIN_A(CBFS)
 			RW_FWID_A 0x40
 		}
 		RW_VPD(PRESERVE) 0x1000
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 2fb180b7ec..70a7437fc8 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 #	select HAVE_PIRQ_TABLE
 	select HAVE_ACPI_TABLES
-	select BOARD_ROMSIZE_KB_16384
+	select BOARD_ROMSIZE_KB_8192
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT if !CHROMEOS
 	select MEMORY_MAPPED_TPM
@@ -29,8 +29,8 @@ config VBOOT
 	select GBB_FLAG_DISABLE_FWMP
 
 config FMDFILE
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab-16M.fmd" if VBOOT_SLOTS_RW_AB
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-8M.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab-8M.fmd" if VBOOT_SLOTS_RW_AB
 
 if ARCH_BOOTBLOCK_X86_64
 
diff --git a/src/mainboard/emulation/qemu-q35/vboot-rwa-16M.fmd b/src/mainboard/emulation/qemu-q35/vboot-rwa-8M.fmd
index 0d2c9da297..55a38b79a9 100644
--- a/src/mainboard/emulation/qemu-q35/vboot-rwa-16M.fmd
+++ b/src/mainboard/emulation/qemu-q35/vboot-rwa-8M.fmd
@@ -1,8 +1,8 @@
-FLASH@0xff000000 0x1000000 {
-	SI_BIOS 0x1000000 {
-		RW_SECTION_A 0x7c0000 {
+FLASH@0xff800000 0x800000 {
+	SI_BIOS 0x800000 {
+		RW_SECTION_A 0x3c0000 {
 			VBLOCK_A 0x10000
-			FW_MAIN_A(CBFS) 0x74ffc0
+			FW_MAIN_A(CBFS)
 			RW_FWID_A 0x40
 		}
 		RW_VPD(PRESERVE) 0x1000
diff --git a/src/mainboard/emulation/qemu-q35/vboot-rwab-16M.fmd b/src/mainboard/emulation/qemu-q35/vboot-rwab-8M.fmd
index fcbfa95b69..8064fdfeaf 100644
--- a/src/mainboard/emulation/qemu-q35/vboot-rwab-16M.fmd
+++ b/src/mainboard/emulation/qemu-q35/vboot-rwab-8M.fmd
@@ -1,5 +1,5 @@
-FLASH@0xff000000 0x1000000 {
-	SI_BIOS 0x1000000 {
+FLASH@0xff800000 0x800000 {
+	SI_BIOS 0x800000 {
 		RW_SECTION_A 0x1c0000 {
 			VBLOCK_A 0x10000
 			FW_MAIN_A(CBFS)