From b8c2aa2ce8fb74bd8bf3407e0a20240c7f41eadf Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Thu, 7 Feb 2008 20:37:37 +0000 Subject: [PATCH] Change references to qemu in Coreboot-v2 calls to qemu-x86. The patch was followed by these svn commands: svn mv targets/emulation/qemu-i386/ targets/emulation/qemu-x86 svn mv --force targets/emulation/qemu-i386/ targets/emulation/qemu-x86 svn mv --force src/mainboard/emulation/qemu-i386/ src/mainboard/emulation/qemu-x86 svn mv --force src/cpu/emulation/qemu-i386/ src/cpu/emulation/qemu-x86 Signed-off-by: Myles Watson Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3093 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/emulation/qemu-i386/chip.h | 6 ------ src/cpu/emulation/qemu-i386/northbridge.h | 5 ----- src/cpu/emulation/{qemu-i386 => qemu-x86}/Config.lb | 0 src/cpu/emulation/qemu-x86/chip.h | 6 ++++++ src/cpu/emulation/{qemu-i386 => qemu-x86}/northbridge.c | 2 +- src/cpu/emulation/qemu-x86/northbridge.h | 5 +++++ src/mainboard/emulation/qemu-i386/chip.h | 4 ---- src/mainboard/emulation/{qemu-i386 => qemu-x86}/Config.lb | 2 +- src/mainboard/emulation/{qemu-i386 => qemu-x86}/Options.lb | 0 src/mainboard/emulation/{qemu-i386 => qemu-x86}/auto.c | 0 src/mainboard/emulation/qemu-x86/chip.h | 4 ++++ src/mainboard/emulation/{qemu-i386 => qemu-x86}/cmos.layout | 0 src/mainboard/emulation/{qemu-i386 => qemu-x86}/debug.c | 0 src/mainboard/emulation/{qemu-i386 => qemu-x86}/failover.c | 0 .../emulation/{qemu-i386 => qemu-x86}/irq_tables.c | 0 src/mainboard/emulation/{qemu-i386 => qemu-x86}/mainboard.c | 2 +- src/mainboard/emulation/{qemu-i386 => qemu-x86}/vgabios.c | 0 targets/emulation/{qemu-i386 => qemu-x86}/Config-abuild.lb | 6 +++--- targets/emulation/{qemu-i386 => qemu-x86}/Config-lab.lb | 6 +++--- targets/emulation/{qemu-i386 => qemu-x86}/Config.OLPC.lb | 6 +++--- targets/emulation/{qemu-i386 => qemu-x86}/Config.lb | 6 +++--- 21 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 src/cpu/emulation/qemu-i386/chip.h delete mode 100644 src/cpu/emulation/qemu-i386/northbridge.h rename src/cpu/emulation/{qemu-i386 => qemu-x86}/Config.lb (100%) create mode 100644 src/cpu/emulation/qemu-x86/chip.h rename src/cpu/emulation/{qemu-i386 => qemu-x86}/northbridge.c (98%) create mode 100644 src/cpu/emulation/qemu-x86/northbridge.h delete mode 100644 src/mainboard/emulation/qemu-i386/chip.h rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/Config.lb (98%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/Options.lb (100%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/auto.c (100%) create mode 100644 src/mainboard/emulation/qemu-x86/chip.h rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/cmos.layout (100%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/debug.c (100%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/failover.c (100%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/irq_tables.c (100%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/mainboard.c (93%) rename src/mainboard/emulation/{qemu-i386 => qemu-x86}/vgabios.c (100%) rename targets/emulation/{qemu-i386 => qemu-x86}/Config-abuild.lb (70%) rename targets/emulation/{qemu-i386 => qemu-x86}/Config-lab.lb (75%) rename targets/emulation/{qemu-i386 => qemu-x86}/Config.OLPC.lb (76%) rename targets/emulation/{qemu-i386 => qemu-x86}/Config.lb (73%) diff --git a/src/cpu/emulation/qemu-i386/chip.h b/src/cpu/emulation/qemu-i386/chip.h deleted file mode 100644 index 6ade17bb01..0000000000 --- a/src/cpu/emulation/qemu-i386/chip.h +++ /dev/null @@ -1,6 +0,0 @@ -struct cpu_emulation_qemu_i386_config -{ -}; - -extern struct chip_operations cpu_emulation_qemu_i386_ops; - diff --git a/src/cpu/emulation/qemu-i386/northbridge.h b/src/cpu/emulation/qemu-i386/northbridge.h deleted file mode 100644 index c74e63b97d..0000000000 --- a/src/cpu/emulation/qemu-i386/northbridge.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef NORTHBRIDGE_EMULATION_QEMU_I386_H -#define NORTHBRIDGE_EMULATION_QEMU_I386_H - - -#endif /* NORTHBRIDGE_EMULATION_QEMU_I386 */ diff --git a/src/cpu/emulation/qemu-i386/Config.lb b/src/cpu/emulation/qemu-x86/Config.lb similarity index 100% rename from src/cpu/emulation/qemu-i386/Config.lb rename to src/cpu/emulation/qemu-x86/Config.lb diff --git a/src/cpu/emulation/qemu-x86/chip.h b/src/cpu/emulation/qemu-x86/chip.h new file mode 100644 index 0000000000..1183200ff7 --- /dev/null +++ b/src/cpu/emulation/qemu-x86/chip.h @@ -0,0 +1,6 @@ +struct cpu_emulation_qemu_x86_config +{ +}; + +extern struct chip_operations cpu_emulation_qemu_x86_ops; + diff --git a/src/cpu/emulation/qemu-i386/northbridge.c b/src/cpu/emulation/qemu-x86/northbridge.c similarity index 98% rename from src/cpu/emulation/qemu-i386/northbridge.c rename to src/cpu/emulation/qemu-x86/northbridge.c index 505511ac95..694df64ec6 100644 --- a/src/cpu/emulation/qemu-i386/northbridge.c +++ b/src/cpu/emulation/qemu-x86/northbridge.c @@ -138,7 +138,7 @@ static void enable_dev(struct device *dev) } } -struct chip_operations cpu_emulation_qemu_i386_ops = { +struct chip_operations cpu_emulation_qemu_x86_ops = { CHIP_NAME("QEMU Northbridge") .enable_dev = enable_dev, }; diff --git a/src/cpu/emulation/qemu-x86/northbridge.h b/src/cpu/emulation/qemu-x86/northbridge.h new file mode 100644 index 0000000000..9ff688be2f --- /dev/null +++ b/src/cpu/emulation/qemu-x86/northbridge.h @@ -0,0 +1,5 @@ +#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H +#define NORTHBRIDGE_EMULATION_QEMU_X86_H + + +#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */ 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 similarity index 98% rename from src/mainboard/emulation/qemu-i386/Config.lb rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/Options.lb rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/auto.c rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/cmos.layout rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/debug.c rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/failover.c rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/irq_tables.c rename to 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 similarity index 93% rename from src/mainboard/emulation/qemu-i386/mainboard.c rename to 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 similarity index 100% rename from src/mainboard/emulation/qemu-i386/vgabios.c rename to src/mainboard/emulation/qemu-x86/vgabios.c diff --git a/targets/emulation/qemu-i386/Config-abuild.lb b/targets/emulation/qemu-x86/Config-abuild.lb similarity index 70% rename from targets/emulation/qemu-i386/Config-abuild.lb rename to targets/emulation/qemu-x86/Config-abuild.lb index ef9b88e4fb..6d26298f08 100644 --- a/targets/emulation/qemu-i386/Config-abuild.lb +++ b/targets/emulation/qemu-x86/Config-abuild.lb @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target emulation_qemu-i386 -mainboard emulation/qemu-i386 +target emulation_qemu-x86 +mainboard emulation/qemu-x86 __COMPRESSION__ diff --git a/targets/emulation/qemu-i386/Config-lab.lb b/targets/emulation/qemu-x86/Config-lab.lb similarity index 75% rename from targets/emulation/qemu-i386/Config-lab.lb rename to targets/emulation/qemu-x86/Config-lab.lb index 76e542ac4e..c8fe328739 100644 --- a/targets/emulation/qemu-i386/Config-lab.lb +++ b/targets/emulation/qemu-x86/Config-lab.lb @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target qemu-i386 -mainboard emulation/qemu-i386 +target qemu-x86 +mainboard emulation/qemu-x86 option ROM_SIZE=2048*1024 option CONFIG_COMPRESSED_PAYLOAD_LZMA=0 diff --git a/targets/emulation/qemu-i386/Config.OLPC.lb b/targets/emulation/qemu-x86/Config.OLPC.lb similarity index 76% rename from targets/emulation/qemu-i386/Config.OLPC.lb rename to targets/emulation/qemu-x86/Config.OLPC.lb index 15c58ed214..de7f0ee587 100644 --- a/targets/emulation/qemu-i386/Config.OLPC.lb +++ b/targets/emulation/qemu-x86/Config.OLPC.lb @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target qemu-i386-OLPC -mainboard emulation/qemu-i386 +target qemu-x86-OLPC +mainboard emulation/qemu-x86 option ROM_SIZE=1024*1024 - (128 * 1024) option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 diff --git a/targets/emulation/qemu-i386/Config.lb b/targets/emulation/qemu-x86/Config.lb similarity index 73% rename from targets/emulation/qemu-i386/Config.lb rename to targets/emulation/qemu-x86/Config.lb index d3978c3867..55f3575d95 100644 --- a/targets/emulation/qemu-i386/Config.lb +++ b/targets/emulation/qemu-x86/Config.lb @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target qemu-i386 -mainboard emulation/qemu-i386 +target qemu-x86 +mainboard emulation/qemu-x86 option ROM_SIZE=256*1024