summaryrefslogtreecommitdiffstats
path: root/hw/petalogix_s3adsp1800_mmu.c
diff options
context:
space:
mode:
authorAndreas Färber2012-05-05 12:20:29 +0200
committerAndreas Färber2012-06-04 23:00:42 +0200
commit3ed607333e979a1637cc08af66858b7b37bd37ff (patch)
treebcabee400a1cc671a33db06ab06ac7807ffe4c89 /hw/petalogix_s3adsp1800_mmu.c
parentpetalogix_ml605: Use cpu_mb_init() to obtain MicroBlazeCPU (diff)
downloadqemu-3ed607333e979a1637cc08af66858b7b37bd37ff.tar.gz
qemu-3ed607333e979a1637cc08af66858b7b37bd37ff.tar.xz
qemu-3ed607333e979a1637cc08af66858b7b37bd37ff.zip
petalogix_s3adsp1800_mmu: Use cpu_mb_init() to obtain MicroBlazeCPU
Needed for microblaze_load_kernel(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw/petalogix_s3adsp1800_mmu.c')
-rw-r--r--hw/petalogix_s3adsp1800_mmu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 8b37336001..7ff3cd5432 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -62,6 +62,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
const char *initrd_filename, const char *cpu_model)
{
DeviceState *dev;
+ MicroBlazeCPU *cpu;
CPUMBState *env;
DriveInfo *dinfo;
int i;
@@ -75,7 +76,8 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
if (cpu_model == NULL) {
cpu_model = "microblaze";
}
- env = cpu_init(cpu_model);
+ cpu = cpu_mb_init(cpu_model);
+ env = &cpu->env;
/* Attach emulated BRAM through the LMB. */
memory_region_init_ram(phys_lmb_bram,