r3093 - in trunk/coreboot-v2: src/cpu/emulation src/cpu/emulation/qemu-x86 src/mainboard/emulation src/mainboard/emulation/qemu-x86 targets/emulation targets/emulation/qemu-x86

Author: myles
Date: 2008-02-07 21:37:37 +0100 (Thu, 07 Feb 2008)
New Revision: 3093

Added:
   trunk/coreboot-v2/src/cpu/emulation/qemu-x86/
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/
   trunk/coreboot-v2/targets/emulation/qemu-x86/
Removed:
   trunk/coreboot-v2/src/cpu/emulation/qemu-i386/
   trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/
   trunk/coreboot-v2/targets/emulation/qemu-i386/
Modified:
   trunk/coreboot-v2/src/cpu/emulation/qemu-x86/chip.h
   trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c
   trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.h
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/chip.h
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c
   trunk/coreboot-v2/targets/emulation/qemu-x86/Config-abuild.lb
   trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb
   trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb
   trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb
Log:

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

Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/chip.h
===================================================================
--- trunk/coreboot-v2/src/cpu/emulation/qemu-i386/chip.h	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/chip.h	2008-02-07 20:37:37 UTC (rev 3093)
@@ -1,6 +1,6 @@
-struct cpu_emulation_qemu_i386_config
+struct cpu_emulation_qemu_x86_config
 {
 };

-extern struct chip_operations cpu_emulation_qemu_i386_ops;
+extern struct chip_operations cpu_emulation_qemu_x86_ops;

Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/cpu/emulation/qemu-i386/northbridge.c	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c	2008-02-07 20:37:37 UTC (rev 3093)
@@ -138,7 +138,7 @@
    }
 }

-struct chip_operations cpu_emulation_qemu_i386_ops = {
+struct chip_operations cpu_emulation_qemu_x86_ops = {
    CHIP_NAME("QEMU Northbridge")
    .enable_dev = enable_dev,
 };

Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.h
===================================================================
--- trunk/coreboot-v2/src/cpu/emulation/qemu-i386/northbridge.h	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.h	2008-02-07 20:37:37 UTC (rev 3093)
@@ -1,5 +1,5 @@
-#ifndef NORTHBRIDGE_EMULATION_QEMU_I386_H
-#define NORTHBRIDGE_EMULATION_QEMU_I386_H
+#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H
+#define NORTHBRIDGE_EMULATION_QEMU_X86_H

-#endif /* NORTHBRIDGE_EMULATION_QEMU_I386 */
+#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/Config.lb	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb	2008-02-07 20:37:37 UTC (rev 3093)
@@ -104,7 +104,7 @@
 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

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/chip.h
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/chip.h	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/chip.h	2008-02-07 20:37:37 UTC (rev 3093)
@@ -1,4 +1,4 @@
-extern struct chip_operations mainboard_emulation_qemu_i386_ops;
+extern struct chip_operations mainboard_emulation_qemu_x86_ops;

-struct mainboard_emulation_qemu_i386_config {
+struct mainboard_emulation_qemu_x86_config {
 };

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/mainboard.c	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c	2008-02-07 20:37:37 UTC (rev 3093)
@@ -33,7 +33,7 @@
    .device = 0x00b8,
 };

-struct chip_operations mainboard_emulation_qemu_i386_ops = {
+struct chip_operations mainboard_emulation_qemu_x86_ops = {
    CHIP_NAME("QEMU Mainboard")
 };

Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-abuild.lb
===================================================================
--- trunk/coreboot-v2/targets/emulation/qemu-i386/Config-abuild.lb	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config-abuild.lb	2008-02-07 20:37:37 UTC (rev 3093)
@@ -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__

Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb
===================================================================
--- trunk/coreboot-v2/targets/emulation/qemu-i386/Config-lab.lb	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb	2008-02-07 20:37:37 UTC (rev 3093)
@@ -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

Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb
===================================================================
--- trunk/coreboot-v2/targets/emulation/qemu-i386/Config.OLPC.lb	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb	2008-02-07 20:37:37 UTC (rev 3093)
@@ -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

Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb
===================================================================
--- trunk/coreboot-v2/targets/emulation/qemu-i386/Config.lb	2008-02-06 22:33:50 UTC (rev 3092)
+++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb	2008-02-07 20:37:37 UTC (rev 3093)
@@ -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