qemu: move i440fx bits

Prepare tree for adding q35 support:
Move emulation/qemu-x86 to emulation/qemu-i440fx.
Rename some stuff to include 'i440fx'.

Change-Id: Ib8c58175c5734cfcda1b22404ef52c09d38f0462
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-on: http://review.coreboot.org/3429
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

src/mainboard/emulation/Kconfig

@@ -3,15 +3,20 @@ if VENDOR_EMULATION
 choice
 	prompt "Mainboard model"
 
-config BOARD_EMULATION_QEMU_X86
+config BOARD_EMULATION_QEMU_X86_I440FX
-	bool "QEMU x86"
+	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

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

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

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

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 = {
+struct chip_operations mainboard_emulation_qemu_i440fx_ops = {
-	CHIP_NAME("QEMU Northbridge")
+	CHIP_NAME("QEMU Northbridge i440fx")
 	.enable_dev = northbridge_enable,
 };

src/mainboard/emulation/qemu-x86/Makefile.inc

@@ -1,3 +0,0 @@
-cpu_incs += $(src)/mainboard/emulation/qemu-x86/cache_as_ram.inc
-ramstage-y += northbridge.c
-ramstage-y += fw_cfg.c