ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Max Filippov 2011-10-16 02:56:07 +04:00 committed by Blue Swirl
parent 935f7a2b42
commit 5e40857374
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.target
View File

@ -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-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
obj-xtensa-y += xtensa_pic.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 += xtensa-semi.o
obj-xtensa-y += core-dc232b.o obj-xtensa-y += core-dc232b.o
obj-xtensa-y += core-fsf.o obj-xtensa-y += core-fsf.o

26
hw/xtensa_dc232b.c → hw/xtensa_sim.c
View File

@ -37,12 +37,12 @@ static uint64_t translate_phys_addr(void *env, uint64_t addr)
return cpu_get_phys_page_debug(env, addr); return cpu_get_phys_page_debug(env, addr);
} }
static void dc232b_reset(void *env) static void sim_reset(void *env)
{ {
cpu_reset(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 *boot_device,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
@ -58,11 +58,11 @@ static void dc232b_init(ram_addr_t ram_size,
exit(1); exit(1);
} }
env->sregs[PRID] = n; env->sregs[PRID] = n;
qemu_register_reset(dc232b_reset, env); qemu_register_reset(sim_reset, env);
/* Need MMU initialized prior to ELF loading, /* Need MMU initialized prior to ELF loading,
* so that ELF gets loaded into virtual addresses * so that ELF gets loaded into virtual addresses
*/ */
dc232b_reset(env); sim_reset(env);
} }
ram = g_malloc(sizeof(*ram)); 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 *boot_device,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) 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) { if (!cpu_model) {
cpu_model = "dc232b"; 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); initrd_filename, cpu_model);
} }
static QEMUMachine xtensa_dc232b_machine = { static QEMUMachine xtensa_sim_machine = {
.name = "dc232b", .name = "sim",
.desc = "Diamond 232L Standard Core Rev.B (LE) (dc232b)", .desc = "sim machine (dc232b)",
.init = xtensa_dc232b_init, .init = xtensa_sim_init,
.max_cpus = 4, .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);

2
tests/xtensa/Makefile
View File

@ -4,7 +4,7 @@ CROSS=xtensa-dc232b-elf-
ifndef XT ifndef XT
SIM = qemu-system-xtensa SIM = qemu-system-xtensa
SIMFLAGS = -M dc232b -nographic -semihosting $(EXTFLAGS) -kernel SIMFLAGS = -M sim -cpu dc232b -nographic -semihosting $(EXTFLAGS) -kernel
SIMDEBUG = -s -S SIMDEBUG = -s -S
else else
SIM = xt-run SIM = xt-run