motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 02:54:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

petalogix_s2adsp1800: moved rst logic to rst fn

Browse source 
This belongs in the machine specific reset function

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Peter A. G. Crosthwaite 2012-03-04 21:03:52 +10:00 • committed by Edgar E. Iglesias
parent d94e743476
commit 1f28fac87e
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hw/petalogix_s3adsp1800_mmu.c
View file

@ -42,6 +42,12 @@
#define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb" #define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb"
static void machine_cpu_reset(CPUState *env)
{
/* FIXME: move to machine specfic cpu reset */
env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */
}
static void static void
petalogix_s3adsp1800_init(ram_addr_t ram_size, petalogix_s3adsp1800_init(ram_addr_t ram_size,
const char *boot_device, const char *boot_device,
@ -53,6 +59,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
CPUState *env; CPUState *env;
DriveInfo *dinfo; DriveInfo *dinfo;
int i; int i;
/* FIXME: remove harcoded magic numbers */
target_phys_addr_t ddr_base = 0x90000000; target_phys_addr_t ddr_base = 0x90000000;
MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1); MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1);
MemoryRegion *phys_ram = g_new(MemoryRegion, 1); MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
@ -65,9 +72,6 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
} }
env = cpu_init(cpu_model); env = cpu_init(cpu_model);
/* FIXME: move to machine specfic cpu reset */
env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */
/* Attach emulated BRAM through the LMB. */ /* Attach emulated BRAM through the LMB. */
memory_region_init_ram(phys_lmb_bram, memory_region_init_ram(phys_lmb_bram,
"petalogix_s3adsp1800.lmb_bram", LMB_BRAM_SIZE); "petalogix_s3adsp1800.lmb_bram", LMB_BRAM_SIZE);
@ -97,7 +101,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
xilinx_ethlite_create(&nd_table[0], 0x81000000, irq[1], 0, 0); xilinx_ethlite_create(&nd_table[0], 0x81000000, irq[1], 0, 0);
microblaze_load_kernel(env, ddr_base, ram_size, microblaze_load_kernel(env, ddr_base, ram_size,
BINARY_DEVICE_TREE_FILE, NULL); BINARY_DEVICE_TREE_FILE, machine_cpu_reset);
} }
static QEMUMachine petalogix_s3adsp1800_machine = { static QEMUMachine petalogix_s3adsp1800_machine = {