From 35784b62cde8b126cdb1fbb2a7a6d170760bd28d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 8 Apr 2010 12:47:35 +0000 Subject: cpu/emulation/qemu-x86 doesn't exist anymore, as this is folded into mainboard/emulation/qemu-x86. Adapt code. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5376 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/emulation/qemu-x86/chip.h | 4 ++-- src/mainboard/emulation/qemu-x86/devicetree.cb | 2 +- src/mainboard/emulation/qemu-x86/northbridge.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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, }; -- cgit v1.2.3