From 5e4085737400ffa3db09f1dc22569b167f9e2675 Mon Sep 17 00:00:00 2001
From: Max Filippov <jcmvbkbc@gmail.com>
Date: Sun, 16 Oct 2011 02:56:07 +0400
Subject: [PATCH] target-xtensa: rename dc232b board to sim

This is to get aligned with the linux name for this machine.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 Makefile.target                      |  2 +-
 hw/{xtensa_dc232b.c => xtensa_sim.c} | 26 +++++++++++++-------------
 tests/xtensa/Makefile                |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename hw/{xtensa_dc232b.c => xtensa_sim.c} (86%)

diff --git a/Makefile.target b/Makefile.target
index 9991d884bf..752221c44b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -370,7 +370,7 @@ obj-alpha-y += vga.o cirrus_vga.o
 obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
 
 obj-xtensa-y += xtensa_pic.o
-obj-xtensa-y += xtensa_dc232b.o
+obj-xtensa-y += xtensa_sim.o
 obj-xtensa-y += xtensa-semi.o
 obj-xtensa-y += core-dc232b.o
 obj-xtensa-y += core-fsf.o
diff --git a/hw/xtensa_dc232b.c b/hw/xtensa_sim.c
similarity index 86%
rename from hw/xtensa_dc232b.c
rename to hw/xtensa_sim.c
index 015d6aaa6b..a94e4e561e 100644
--- a/hw/xtensa_dc232b.c
+++ b/hw/xtensa_sim.c
@@ -37,12 +37,12 @@ static uint64_t translate_phys_addr(void *env, uint64_t addr)
     return cpu_get_phys_page_debug(env, addr);
 }
 
-static void dc232b_reset(void *env)
+static void sim_reset(void *env)
 {
     cpu_reset(env);
 }
 
-static void dc232b_init(ram_addr_t ram_size,
+static void sim_init(ram_addr_t ram_size,
         const char *boot_device,
         const char *kernel_filename, const char *kernel_cmdline,
         const char *initrd_filename, const char *cpu_model)
@@ -58,11 +58,11 @@ static void dc232b_init(ram_addr_t ram_size,
             exit(1);
         }
         env->sregs[PRID] = n;
-        qemu_register_reset(dc232b_reset, env);
+        qemu_register_reset(sim_reset, env);
         /* Need MMU initialized prior to ELF loading,
          * so that ELF gets loaded into virtual addresses
          */
-        dc232b_reset(env);
+        sim_reset(env);
     }
 
     ram = g_malloc(sizeof(*ram));
@@ -89,7 +89,7 @@ static void dc232b_init(ram_addr_t ram_size,
     }
 }
 
-static void xtensa_dc232b_init(ram_addr_t ram_size,
+static void xtensa_sim_init(ram_addr_t ram_size,
                      const char *boot_device,
                      const char *kernel_filename, const char *kernel_cmdline,
                      const char *initrd_filename, const char *cpu_model)
@@ -97,20 +97,20 @@ static void xtensa_dc232b_init(ram_addr_t ram_size,
     if (!cpu_model) {
         cpu_model = "dc232b";
     }
-    dc232b_init(ram_size, boot_device, kernel_filename, kernel_cmdline,
+    sim_init(ram_size, boot_device, kernel_filename, kernel_cmdline,
             initrd_filename, cpu_model);
 }
 
-static QEMUMachine xtensa_dc232b_machine = {
-    .name = "dc232b",
-    .desc = "Diamond 232L Standard Core Rev.B (LE) (dc232b)",
-    .init = xtensa_dc232b_init,
+static QEMUMachine xtensa_sim_machine = {
+    .name = "sim",
+    .desc = "sim machine (dc232b)",
+    .init = xtensa_sim_init,
     .max_cpus = 4,
 };
 
-static void xtensa_dc232b_machine_init(void)
+static void xtensa_sim_machine_init(void)
 {
-    qemu_register_machine(&xtensa_dc232b_machine);
+    qemu_register_machine(&xtensa_sim_machine);
 }
 
-machine_init(xtensa_dc232b_machine_init);
+machine_init(xtensa_sim_machine_init);
diff --git a/tests/xtensa/Makefile b/tests/xtensa/Makefile
index 15d39dace1..8713af16eb 100644
--- a/tests/xtensa/Makefile
+++ b/tests/xtensa/Makefile
@@ -4,7 +4,7 @@ CROSS=xtensa-dc232b-elf-
 
 ifndef XT
 SIM = qemu-system-xtensa
-SIMFLAGS = -M dc232b -nographic -semihosting $(EXTFLAGS) -kernel
+SIMFLAGS = -M sim -cpu dc232b -nographic -semihosting $(EXTFLAGS) -kernel
 SIMDEBUG = -s -S
 else
 SIM = xt-run
-- 
2.11.4.GIT