11 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/emulation/qemu-i386/chip.h b/src/mainboard/emulation/qemu-i386/chip.h
deleted file mode 100644
index 3aae25c769..0000000000
--- a/src/mainboard/emulation/qemu-i386/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-extern struct chip_operations mainboard_emulation_qemu_i386_ops;
-
-struct mainboard_emulation_qemu_i386_config {
-};
diff --git a/src/mainboard/emulation/qemu-i386/Config.lb b/src/mainboard/emulation/qemu-x86/Config.lb
index b2a009d2e5..f159772c6b 100644
--- a/src/mainboard/emulation/qemu-i386/Config.lb
+++ b/src/mainboard/emulation/qemu-x86/Config.lb
@@ -104,7 +104,7 @@ mainboardinit ./auto.inc
 dir /pc80
 config chip.h
 
-chip cpu/emulation/qemu-i386
+chip cpu/emulation/qemu-x86
 	device pci_domain 0 on 
 		device pci 0.0 on end
 		device pci 1.0 on end
diff --git a/src/mainboard/emulation/qemu-i386/Options.lb b/src/mainboard/emulation/qemu-x86/Options.lb
index 74e543f737..74e543f737 100644
--- a/src/mainboard/emulation/qemu-i386/Options.lb
+++ b/src/mainboard/emulation/qemu-x86/Options.lb
diff --git a/src/mainboard/emulation/qemu-i386/auto.c b/src/mainboard/emulation/qemu-x86/auto.c
index d2fa623d68..d2fa623d68 100644
--- a/src/mainboard/emulation/qemu-i386/auto.c
+++ b/src/mainboard/emulation/qemu-x86/auto.c
diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h
new file mode 100644
index 0000000000..d6ecdde37b
--- /dev/null
+++ b/src/mainboard/emulation/qemu-x86/chip.h
@@ -0,0 +1,4 @@
+extern struct chip_operations mainboard_emulation_qemu_x86_ops;
+
+struct mainboard_emulation_qemu_x86_config {
+};
diff --git a/src/mainboard/emulation/qemu-i386/cmos.layout b/src/mainboard/emulation/qemu-x86/cmos.layout
index 5ba4c032c1..5ba4c032c1 100644
--- a/src/mainboard/emulation/qemu-i386/cmos.layout
+++ b/src/mainboard/emulation/qemu-x86/cmos.layout
diff --git a/src/mainboard/emulation/qemu-i386/debug.c b/src/mainboard/emulation/qemu-x86/debug.c
index 714fcc5783..714fcc5783 100644
--- a/src/mainboard/emulation/qemu-i386/debug.c
+++ b/src/mainboard/emulation/qemu-x86/debug.c
diff --git a/src/mainboard/emulation/qemu-i386/failover.c b/src/mainboard/emulation/qemu-x86/failover.c
index 10bb2f48c1..10bb2f48c1 100644
--- a/src/mainboard/emulation/qemu-i386/failover.c
+++ b/src/mainboard/emulation/qemu-x86/failover.c
diff --git a/src/mainboard/emulation/qemu-i386/irq_tables.c b/src/mainboard/emulation/qemu-x86/irq_tables.c
index d75eaa4639..d75eaa4639 100644
--- a/src/mainboard/emulation/qemu-i386/irq_tables.c
+++ b/src/mainboard/emulation/qemu-x86/irq_tables.c
diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c
index cfbc0b2246..f00a2cca2d 100644
--- a/src/mainboard/emulation/qemu-i386/mainboard.c
+++ b/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -33,7 +33,7 @@ static const struct pci_driver vga_driver __pci_driver = {
 	.device = 0x00b8,
 };
 
-struct chip_operations mainboard_emulation_qemu_i386_ops = {
+struct chip_operations mainboard_emulation_qemu_x86_ops = {
 	CHIP_NAME("QEMU Mainboard")
 };
 
diff --git a/src/mainboard/emulation/qemu-i386/vgabios.c b/src/mainboard/emulation/qemu-x86/vgabios.c
index 7f42f0ab12..7f42f0ab12 100644
--- a/src/mainboard/emulation/qemu-i386/vgabios.c
+++ b/src/mainboard/emulation/qemu-x86/vgabios.c