microblaze: The petalogix s3adsp board uses intel flashes

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>

diff --git a/Makefile.target b/Makefile.target
index 0bf2253caee08ec533d2dfaf3a63b7fe54f8c815..5c0ef1f8c8c6298450c4572cf67d2395b5b2710c 100644 (file)
--- 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 bda08c561a3601ef5a165a85779587630a85871c..874363630295e40553c1a11005b363e13646b4cb 100644 (file)
--- 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);