summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-04-08 12:47:35 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-04-08 12:47:35 +0000
commit35784b62cde8b126cdb1fbb2a7a6d170760bd28d (patch)
tree69a5f8dcdb601f532448bf60f1b2673696b201af /src
parent2bbd0c29261d985e21dc69a731c895ee2791eb4b (diff)
downloadcoreboot-35784b62cde8b126cdb1fbb2a7a6d170760bd28d.tar.xz
cpu/emulation/qemu-x86 doesn't exist anymore, as this
is folded into mainboard/emulation/qemu-x86. Adapt code. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5376 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/emulation/qemu-x86/chip.h4
-rw-r--r--src/mainboard/emulation/qemu-x86/devicetree.cb2
-rw-r--r--src/mainboard/emulation/qemu-x86/northbridge.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h
index b9394195d7..41477cd2af 100644
--- a/src/mainboard/emulation/qemu-x86/chip.h
+++ b/src/mainboard/emulation/qemu-x86/chip.h
@@ -3,9 +3,9 @@ extern struct chip_operations mainboard_ops;
struct mainboard_config {
};
-struct cpu_emulation_qemu_x86_config
+struct mainboard_emulation_qemu_x86_config
{
};
-extern struct chip_operations cpu_emulation_qemu_x86_ops;
+extern struct chip_operations mainboard_emulation_qemu_x86_ops;
diff --git a/src/mainboard/emulation/qemu-x86/devicetree.cb b/src/mainboard/emulation/qemu-x86/devicetree.cb
index 745ff189d1..2e18d790c9 100644
--- a/src/mainboard/emulation/qemu-x86/devicetree.cb
+++ b/src/mainboard/emulation/qemu-x86/devicetree.cb
@@ -1,4 +1,4 @@
-chip cpu/emulation/qemu-x86
+chip mainboard/emulation/qemu-x86
device pci_domain 0 on
device pci 0.0 on end
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
index 4184d14a17..4260d0c954 100644
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-x86/northbridge.c
@@ -152,7 +152,7 @@ static void enable_dev(struct device *dev)
}
}
-struct chip_operations cpu_emulation_qemu_x86_ops = {
+struct chip_operations mainboard_emulation_qemu_x86_ops = {
CHIP_NAME("QEMU Northbridge")
.enable_dev = enable_dev,
};