Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[platform/kernel/u-boot.git] / cpu / nios2 / epcs.c

diff --git a/cpu/nios2/epcs.c b/cpu/nios2/epcs.c
index 968b50f..ab7d746 100644 (file)
--- a/cpu/nios2/epcs.c
+++ b/cpu/nios2/epcs.c
@@ -47,7 +47,7 @@
        "epcs write addr offset count\n"\
        "    - write count bytes to offset from addr.\n"\
        "epcs verify addr offset count\n"\
-       "    - verify count bytes at offset from addr.\n"
+       "    - verify count bytes at offset from addr."
 
 
 /*-----------------------------------------------------------------------*/
@@ -85,7 +85,7 @@ static int epcs_cs (int assert)
 
        if (assert) {
                tmp = readl (&epcs->control);
-               writel (&epcs->control, tmp | NIOS_SPI_SSO);
+               writel (tmp | NIOS_SPI_SSO, &epcs->control);
        } else {
                /* Let all bits shift out */
                start = get_timer (0);
@@ -93,7 +93,7 @@ static int epcs_cs (int assert)
                        if (get_timer (start) > EPCS_TIMEOUT)
                                return (-1);
                tmp = readl (&epcs->control);
-               writel (&epcs->control, tmp & ~NIOS_SPI_SSO);
+               writel (tmp & ~NIOS_SPI_SSO, &epcs->control);
        }
        return (0);
 }
@@ -106,7 +106,7 @@ static int epcs_tx (unsigned char c)
        while ((readl (&epcs->status) & NIOS_SPI_TRDY) == 0)
                if (get_timer (start) > EPCS_TIMEOUT)
                        return (-1);
-       writel (&epcs->txdata, c);
+       writel (c, &epcs->txdata);
        return (0);
 }
 
@@ -207,6 +207,8 @@ static void epcs_status_wr (unsigned char status)
 static struct epcs_devinfo_t devinfo[] = {
        { "EPCS1 ", 0x10, 17, 4, 15, 8, 0x0c },
        { "EPCS4 ", 0x12, 19, 8, 16, 8, 0x1c },
+       { "EPCS16", 0x14, 21, 32, 16, 8, 0x1c },
+       { "EPCS64", 0x16, 23,128, 16, 8, 0x1c },
        { 0, 0, 0, 0, 0, 0 }
 };
 
@@ -501,15 +503,17 @@ void do_epcs_info (struct epcs_devinfo_t *dev, int argc, char *argv[])
        }
 
        /* Sector info */
-       for (i=0; i<dev->num_sects; i++) {
+       for (i=0; (i < dev->num_sects) && (argc > 1); i++) {
                erased = epcs_sect_erased (i, &tmp, dev);
-               printf ("     %d: %06x ",
+               if ((i & 0x03) == 0) printf ("\n");
+               printf ("%4d: %07x ",
                        i, i*(1<<dev->sz_sect) );
                if (erased)
-                       printf ("erased\n");
+                       printf ("E ");
                else
-                       printf ("data @ 0x%06x\n", tmp);
+                       printf ("  ");
        }
+       printf ("\n");
 
        return;
 }