r3566 - in trunk/src/host/qemu-neo1973: . hw openmoko

andrew at sita.openmoko.org andrew at sita.openmoko.org
Wed Dec 5 02:54:49 CET 2007


Author: andrew
Date: 2007-12-05 02:54:47 +0100 (Wed, 05 Dec 2007)
New Revision: 3566

Modified:
   trunk/src/host/qemu-neo1973/hw/boards.h
   trunk/src/host/qemu-neo1973/hw/neo1973.c
   trunk/src/host/qemu-neo1973/openmoko/env
   trunk/src/host/qemu-neo1973/vl.c
Log:
High time we rename -M neo to -M gta01 and fix the descriptions.  External scripts need updating accordingly.


Modified: trunk/src/host/qemu-neo1973/hw/boards.h
===================================================================
--- trunk/src/host/qemu-neo1973/hw/boards.h	2007-12-05 01:42:04 UTC (rev 3565)
+++ trunk/src/host/qemu-neo1973/hw/boards.h	2007-12-05 01:54:47 UTC (rev 3566)
@@ -74,7 +74,7 @@
 extern QEMUMachine terrierpda_machine;
 
 /* neo1973.c */
-extern QEMUMachine neo1973_machine;
+extern QEMUMachine gta01_machine;
 
 /* palm.c */
 extern QEMUMachine palmte_machine;

Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c	2007-12-05 01:42:04 UTC (rev 3565)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c	2007-12-05 01:54:47 UTC (rev 3566)
@@ -1,5 +1,5 @@
 /*
- * Neo1973/GTA01 mobile telephone platform emulation.
+ * Neo1973 mobile telephone platforms emulation.
  * Detailed information at openmoko.org.
  *
  * Copyright (c) 2007 OpenMoko, Inc.
@@ -415,7 +415,7 @@
 };
 
 /* Board init.  */
-static void neo_init(int ram_size, int vga_ram_size, const char *boot_device,
+static void gta01_init(int ram_size, int vga_ram_size, const char *boot_device,
                 DisplayState *ds, const char *kernel_filename,
                 const char *kernel_cmdline, const char *initrd_filename,
                 const char *cpu_model)
@@ -470,8 +470,8 @@
     dpy_resize(ds, 480, 640);
 }
 
-QEMUMachine neo1973_machine = {
-    "neo",
-    "Neo1973 phone aka FIC GTA01 aka OpenMoko (S3C2410A)",
-    neo_init,
+QEMUMachine gta01_machine = {
+    "gta01",
+    "FIC Neo1973 rev GTA01 aka OpenMoko phone (S3C2410A)",
+    gta01_init,
 };

Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env	2007-12-05 01:42:04 UTC (rev 3565)
+++ trunk/src/host/qemu-neo1973/openmoko/env	2007-12-05 01:54:47 UTC (rev 3566)
@@ -4,7 +4,7 @@
 script_dir_relative=openmoko
 script_dir="$src_dir/$script_dir_relative"
 uboot_symlink="$src_dir/u-boot.bin"
-qemu_relative="arm-softmmu/qemu-system-arm -M neo -m 130"
+qemu_relative="arm-softmmu/qemu-system-arm -M gta01 -m 130"
 qemu="$src_dir/$qemu_relative"
 flash_base=openmoko-flash.base
 flash_image=openmoko-flash.image

Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c	2007-12-05 01:42:04 UTC (rev 3565)
+++ trunk/src/host/qemu-neo1973/vl.c	2007-12-05 01:54:47 UTC (rev 3566)
@@ -8071,7 +8071,7 @@
     qemu_register_machine(&spitzpda_machine);
     qemu_register_machine(&borzoipda_machine);
     qemu_register_machine(&terrierpda_machine);
-    qemu_register_machine(&neo1973_machine);
+    qemu_register_machine(&gta01_machine);
     qemu_register_machine(&palmte_machine);
     qemu_register_machine(&lm3s811evb_machine);
     qemu_register_machine(&lm3s6965evb_machine);





More information about the commitlog mailing list