Changeset 3627 for trunk/src/host/qemu-neo1973/hw/mainstone.c

Timestamp:

12/10/07 18:51:36 (5 years ago)

Author:

andrew

Message:

Weekly sync with cvs.savannah.nongnu.org.

File:

• trunk/src/host/qemu-neo1973/hw/mainstone.c (modified) (3 diffs)

trunk/src/host/qemu-neo1973/hw/mainstone.c

@@ -56 +56 @@
         exit(1);
     }
-    if (!pflash_register(MST_FLASH_0, mainstone_ram + PXA2XX_INTERNAL_SIZE,
+    if (!pflash_cfi01_register(MST_FLASH_0,
+                         mainstone_ram + PXA2XX_INTERNAL_SIZE,
                          drives_table[index].bdrv,
                          256 * 1024, 128, 4, 0, 0, 0, 0)) {
@@ -69 +70 @@
         exit(1);
     }
-    if (!pflash_register(MST_FLASH_1, mainstone_ram + PXA2XX_INTERNAL_SIZE,
+    if (!pflash_cfi01_register(MST_FLASH_1,
+                         mainstone_ram + PXA2XX_INTERNAL_SIZE,
                          drives_table[index].bdrv,
                          256 * 1024, 128, 4, 0, 0, 0, 0)) {
@@ -77 +79 @@
 
     mst_irq = mst_irq_init(cpu, MST_FPGA_PHYS, PXA2XX_PIC_GPIO_0);
+
+    /* MMC/SD host */
+    pxa2xx_mmci_handlers(cpu->mmc, NULL, mst_irq[MMC_IRQ]);
+
     smc91c111_init(&nd_table[0], MST_ETH_PHYS, mst_irq[ETHERNET_IRQ]);