22 files changed, 17 insertions, 12 deletions
diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig
index ea6b18077b..72b70af6da 100644
--- a/src/mainboard/emulation/Kconfig
+++ b/src/mainboard/emulation/Kconfig
@@ -3,15 +3,20 @@ if VENDOR_EMULATION
 choice
 	prompt "Mainboard model"
 
-config BOARD_EMULATION_QEMU_X86
-	bool "QEMU x86"
+config BOARD_EMULATION_QEMU_X86_I440FX
+	bool "QEMU x86 i440fx/piix4 (aka qemu -M pc)"
 
 config BOARD_EMULATION_QEMU_ARMV7
 	bool "QEMU armv7 (vexpress-a9)"
 
 endchoice
 
-source "src/mainboard/emulation/qemu-x86/Kconfig"
+config BOARD_EMULATION_QEMU_X86
+	bool
+	default y
+	depends on BOARD_EMULATION_QEMU_X86_I440FX
+
+source "src/mainboard/emulation/qemu-i440fx/Kconfig"
 source "src/mainboard/emulation/qemu-armv7/Kconfig"
 
 config MAINBOARD_VENDOR
diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index f8167941fd..a61050a755 100644
--- a/src/mainboard/emulation/qemu-x86/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_EMULATION_QEMU_X86
+if BOARD_EMULATION_QEMU_X86_I440FX
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -15,11 +15,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 
 config MAINBOARD_DIR
 	string
-	default emulation/qemu-x86
+	default emulation/qemu-i440fx
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "QEMU x86"
+	default "QEMU x86 i440fx/piix4"
 
 config IRQ_SLOT_COUNT
 	int
diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
new file mode 100644
index 0000000000..7423b2b84b
--- /dev/null
+++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
@@ -0,0 +1,3 @@
+cpu_incs += $(src)/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
+ramstage-y += northbridge.c
+ramstage-y += fw_cfg.c
diff --git a/src/mainboard/emulation/qemu-x86/acpi/cpu-hotplug.asl b/src/mainboard/emulation/qemu-i440fx/acpi/cpu-hotplug.asl
index 0f3e83b14d..0f3e83b14d 100644
--- a/src/mainboard/emulation/qemu-x86/acpi/cpu-hotplug.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/cpu-hotplug.asl
diff --git a/src/mainboard/emulation/qemu-x86/acpi/dbug.asl b/src/mainboard/emulation/qemu-i440fx/acpi/dbug.asl
index 276321f617..276321f617 100644
--- a/src/mainboard/emulation/qemu-x86/acpi/dbug.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/dbug.asl
diff --git a/src/mainboard/emulation/qemu-x86/acpi/hpet.asl b/src/mainboard/emulation/qemu-i440fx/acpi/hpet.asl
index f33e52795f..f33e52795f 100644
--- a/src/mainboard/emulation/qemu-x86/acpi/hpet.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/hpet.asl
diff --git a/src/mainboard/emulation/qemu-x86/acpi/isa.asl b/src/mainboard/emulation/qemu-i440fx/acpi/isa.asl
index 23761dbbac..23761dbbac 100644
--- a/src/mainboard/emulation/qemu-x86/acpi/isa.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/isa.asl
diff --git a/src/mainboard/emulation/qemu-x86/acpi/pci-crs.asl b/src/mainboard/emulation/qemu-i440fx/acpi/pci-crs.asl
index 63d1fd5dde..63d1fd5dde 100644
--- a/src/mainboard/emulation/qemu-x86/acpi/pci-crs.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/pci-crs.asl
diff --git a/src/mainboard/emulation/qemu-x86/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
index 904fe0fdd2..904fe0fdd2 100644
--- a/src/mainboard/emulation/qemu-x86/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
diff --git a/src/mainboard/emulation/qemu-x86/cache_as_ram.inc b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
index 11ac91d049..11ac91d049 100644
--- a/src/mainboard/emulation/qemu-x86/cache_as_ram.inc
+++ b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
diff --git a/src/mainboard/emulation/qemu-x86/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout
index c1354a2866..c1354a2866 100644
--- a/src/mainboard/emulation/qemu-x86/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
diff --git a/src/mainboard/emulation/qemu-x86/devicetree.cb b/src/mainboard/emulation/qemu-i440fx/devicetree.cb
index f37454be09..a4fcef1fd9 100644
--- a/src/mainboard/emulation/qemu-x86/devicetree.cb
+++ b/src/mainboard/emulation/qemu-i440fx/devicetree.cb
@@ -1,4 +1,4 @@
-chip mainboard/emulation/qemu-x86
+chip mainboard/emulation/qemu-i440fx
 	device cpu_cluster 0 on
 		chip cpu/qemu-x86
 			device lapic 0 on end
diff --git a/src/mainboard/emulation/qemu-x86/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
index e63d10fb42..e63d10fb42 100644
--- a/src/mainboard/emulation/qemu-x86/dsdt.asl
+++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
diff --git a/src/mainboard/emulation/qemu-x86/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
index 5166f83092..5166f83092 100644
--- a/src/mainboard/emulation/qemu-x86/fw_cfg.c
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
diff --git a/src/mainboard/emulation/qemu-x86/fw_cfg.h b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h
index 063e48f838..063e48f838 100644
--- a/src/mainboard/emulation/qemu-x86/fw_cfg.h
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h
diff --git a/src/mainboard/emulation/qemu-x86/fw_cfg_if.h b/src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h
index d159f12d09..d159f12d09 100644
--- a/src/mainboard/emulation/qemu-x86/fw_cfg_if.h
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h
diff --git a/src/mainboard/emulation/qemu-x86/irq_tables.c b/src/mainboard/emulation/qemu-i440fx/irq_tables.c
index 21eeabf331..21eeabf331 100644
--- a/src/mainboard/emulation/qemu-x86/irq_tables.c
+++ b/src/mainboard/emulation/qemu-i440fx/irq_tables.c
diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-i440fx/mainboard.c
index f651b99094..f651b99094 100644
--- a/src/mainboard/emulation/qemu-x86/mainboard.c
+++ b/src/mainboard/emulation/qemu-i440fx/mainboard.c
diff --git a/src/mainboard/emulation/qemu-x86/memory.c b/src/mainboard/emulation/qemu-i440fx/memory.c
index 322fc492ec..322fc492ec 100644
--- a/src/mainboard/emulation/qemu-x86/memory.c
+++ b/src/mainboard/emulation/qemu-i440fx/memory.c
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 992a39e673..c2e4ba22b3 100644
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -185,7 +185,7 @@ static void northbridge_enable(struct device *dev)
 	}
 }
 
-struct chip_operations mainboard_emulation_qemu_x86_ops = {
-	CHIP_NAME("QEMU Northbridge")
+struct chip_operations mainboard_emulation_qemu_i440fx_ops = {
+	CHIP_NAME("QEMU Northbridge i440fx")
 	.enable_dev = northbridge_enable,
 };
diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c
index 3faf947e00..3faf947e00 100644
--- a/src/mainboard/emulation/qemu-x86/romstage.c
+++ b/src/mainboard/emulation/qemu-i440fx/romstage.c
diff --git a/src/mainboard/emulation/qemu-x86/Makefile.inc b/src/mainboard/emulation/qemu-x86/Makefile.inc
deleted file mode 100644
index 21d73442ca..0000000000
--- a/src/mainboard/emulation/qemu-x86/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-cpu_incs += $(src)/mainboard/emulation/qemu-x86/cache_as_ram.inc
-ramstage-y += northbridge.c
-ramstage-y += fw_cfg.c