From: Edgar E. Iglesias Date: Sun, 24 Jan 2010 16:15:05 +0000 (+0100) Subject: microblaze: The petalogix s3adsp board uses intel flashes X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~6038 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3997ac42c8e5a824f659a972cd97d570b677ac57;p=sdk%2Femulator%2Fqemu.git microblaze: The petalogix s3adsp board uses intel flashes Signed-off-by: Edgar E. Iglesias --- 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);