diff options
-rw-r--r-- | Makefile.target | 2 | ||||
-rw-r--r-- | hw/petalogix_s3adsp1800_mmu.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 0bf2253..5c0ef1f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -252,7 +252,7 @@ obj-microblaze-y += xilinx_timer.o obj-microblaze-y += xilinx_uartlite.o obj-microblaze-y += xilinx_ethlite.o -obj-microblaze-y += pflash_cfi02.o +obj-microblaze-y += pflash_cfi01.o obj-microblaze-$(CONFIG_FDT) += device_tree.o diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index bda08c5..8743636 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -141,11 +141,10 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, phys_flash = qemu_ram_alloc(FLASH_SIZE); dinfo = drive_get(IF_PFLASH, 0, 0); - pflash_cfi02_register(0xa0000000, phys_flash, + pflash_cfi01_register(0xa0000000, phys_flash, dinfo ? dinfo->bdrv : NULL, (64 * 1024), FLASH_SIZE >> 16, - 1, 1, 0x0000, 0x0000, 0x0000, 0x0000, - 0x555, 0x2aa); + 1, 0x89, 0x18, 0x0000, 0x0); cpu_irq = microblaze_pic_init_cpu(env); dev = xilinx_intc_create(0x81800000, cpu_irq[0], 2); |