diff options
| author | Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> | 2012-03-04 21:03:52 +1000 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2012-03-05 23:00:14 +0100 |
| commit | 1f28fac87e8f1003cf77bb04e62e17e1236530b1 (patch) | |
| tree | 08652cd83f2b4784b914856bd3ac0fe9d0323e00 /hw/petalogix_s3adsp1800_mmu.c | |
| parent | d94e743476bf7d0d55ea6f4a90760054ce959030 (diff) | |
petalogix_s2adsp1800: moved rst logic to rst fn
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>
Diffstat (limited to 'hw/petalogix_s3adsp1800_mmu.c')
| -rw-r--r-- | hw/petalogix_s3adsp1800_mmu.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index 7c6e9b83f4..99c3590f2b 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -42,6 +42,12 @@ #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 petalogix_s3adsp1800_init(ram_addr_t ram_size, const char *boot_device, @@ -53,6 +59,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, CPUState *env; DriveInfo *dinfo; int i; + /* FIXME: remove harcoded magic numbers */ target_phys_addr_t ddr_base = 0x90000000; MemoryRegion *phys_lmb_bram = 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); - /* FIXME: move to machine specfic cpu reset */ - env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */ - /* Attach emulated BRAM through the LMB. */ memory_region_init_ram(phys_lmb_bram, "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); 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 = { |