diff options
| author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2010-01-24 17:15:05 +0100 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2010-01-24 17:15:05 +0100 |
| commit | 2548de3a343e893afcd7aceb824ea4a7137e6f31 (patch) | |
| tree | 45d4ea9ff19038e6e5c4999add98b34284cf6c76 | |
| parent | 292444cb87f3b883146ee30628a5922b1cde4073 (diff) | |
| download | qemu-2548de3a343e893afcd7aceb824ea4a7137e6f31.tar.gz | |
microblaze: The petalogix s3adsp board uses intel flashes
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
| -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 0bf2253cae..5c0ef1f8c8 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 bda08c561a..8743636302 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); |