Merge branch 'tx6-bugfix'

[karo-tx-uboot.git] / common / cmd_sf.c

diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index 342021df97e79195aacaba4c756bb3737dcd98be..ac7f5dfb8181c28147ed9b1ea83e62e59c8ef20a 100644 (file)
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -13,6 +13,8 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <jffs2/jffs2.h>
+#include <linux/mtd/mtd.h>
 
 #include <asm/io.h>
 #include <dm/device-internal.h>
@@ -133,14 +135,17 @@ static int do_spi_flash_probe(int argc, char * const argv[])
 
        flash = dev_get_uclass_priv(new);
 #else
+       if (flash)
+               spi_flash_free(flash);
+
        new = spi_flash_probe(bus, cs, speed, mode);
+       flash = new;
+
        if (!new) {
                printf("Failed to initialize SPI flash at %u:%u\n", bus, cs);
                return 1;
        }
 
-       if (flash)
-               spi_flash_free(flash);
        flash = new;
 #endif
 
@@ -218,7 +223,7 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,
 
        if (end - buf >= 200)
                scale = (end - buf) / 100;
-       cmp_buf = malloc(flash->sector_size);
+       cmp_buf = memalign(ARCH_DMA_MINALIGN, flash->sector_size);
        if (cmp_buf) {
                ulong last_update = get_timer(0);
 
@@ -256,23 +261,21 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,
 static int do_spi_flash_read_write(int argc, char * const argv[])
 {
        unsigned long addr;
-       unsigned long offset;
-       unsigned long len;
        void *buf;
        char *endp;
        int ret = 1;
+       int dev = 0;
+       loff_t offset, len, maxsize;
 
-       if (argc < 4)
+       if (argc < 3)
                return -1;
 
        addr = simple_strtoul(argv[1], &endp, 16);
        if (*argv[1] == 0 || *endp != 0)
                return -1;
-       offset = simple_strtoul(argv[2], &endp, 16);
-       if (*argv[2] == 0 || *endp != 0)
-               return -1;
-       len = simple_strtoul(argv[3], &endp, 16);
-       if (*argv[3] == 0 || *endp != 0)
+
+       if (mtd_arg_off_size(argc - 2, &argv[2], &dev, &offset, &len,
+                            &maxsize, MTD_DEV_TYPE_NOR, flash->size))
                return -1;
 
        /* Consistency checking */
@@ -300,8 +303,12 @@ static int do_spi_flash_read_write(int argc, char * const argv[])
                else
                        ret = spi_flash_write(flash, offset, len, buf);
 
-               printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset,
-                      read ? "Read" : "Written", ret ? "ERROR" : "OK");
+               printf("SF: %zu bytes @ %#x %s: ", (size_t)len, (u32)offset,
+                      read ? "Read" : "Written");
+               if (ret)
+                       printf("ERROR %d\n", ret);
+               else
+                       printf("OK\n");
        }
 
        unmap_physmem(buf, len);
@@ -311,31 +318,31 @@ static int do_spi_flash_read_write(int argc, char * const argv[])
 
 static int do_spi_flash_erase(int argc, char * const argv[])
 {
-       unsigned long offset;
-       unsigned long len;
-       char *endp;
        int ret;
+       int dev = 0;
+       loff_t offset, len, maxsize;
+       ulong size;
 
        if (argc < 3)
                return -1;
 
-       offset = simple_strtoul(argv[1], &endp, 16);
-       if (*argv[1] == 0 || *endp != 0)
+       if (mtd_arg_off(argv[1], &dev, &offset, &len, &maxsize,
+                       MTD_DEV_TYPE_NOR, flash->size))
                return -1;
 
-       ret = sf_parse_len_arg(argv[2], &len);
+       ret = sf_parse_len_arg(argv[2], &size);
        if (ret != 1)
                return -1;
 
        /* Consistency checking */
-       if (offset + len > flash->size) {
+       if (offset + size > flash->size) {
                printf("ERROR: attempting %s past flash size (%#x)\n",
                       argv[0], flash->size);
                return 1;
        }
 
-       ret = spi_flash_erase(flash, offset, len);
-       printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
+       ret = spi_flash_erase(flash, offset, size);
+       printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)size, (u32)offset,
               ret ? "ERROR" : "OK");
 
        return ret == 0 ? 0 : 1;
@@ -477,12 +484,12 @@ static int do_spi_flash_test(int argc, char * const argv[])
        if (*argv[2] == 0 || *endp != 0)
                return -1;
 
-       vbuf = malloc(len);
+       vbuf = memalign(ARCH_DMA_MINALIGN, len);
        if (!vbuf) {
                printf("Cannot allocate memory (%lu bytes)\n", len);
                return 1;
        }
-       buf = malloc(len);
+       buf = memalign(ARCH_DMA_MINALIGN, len);
        if (!buf) {
                free(vbuf);
                printf("Cannot allocate memory (%lu bytes)\n", len);
@@ -560,13 +567,17 @@ U_BOOT_CMD(
        "SPI flash sub-system",
        "probe [[bus:]cs] [hz] [mode]   - init flash device on given SPI bus\n"
        "                                 and chip select\n"
-       "sf read addr offset len        - read `len' bytes starting at\n"
-       "                                 `offset' to memory at `addr'\n"
-       "sf write addr offset len       - write `len' bytes from memory\n"
-       "                                 at `addr' to flash at `offset'\n"
-       "sf erase offset [+]len         - erase `len' bytes from `offset'\n"
-       "                                 `+len' round up `len' to block size\n"
-       "sf update addr offset len      - erase and write `len' bytes from memory\n"
-       "                                 at `addr' to flash at `offset'"
+       "sf read addr offset|partition len      - read `len' bytes starting at\n"
+       "                                         `offset' or from start of mtd\n"
+       "                                         `partition'to memory at `addr'\n"
+       "sf write addr offset|partition len     - write `len' bytes from memory\n"
+       "                                         at `addr' to flash at `offset'\n"
+       "                                         or to start of mtd `partition'\n"
+       "sf erase offset|partition [+]len       - erase `len' bytes from `offset'\n"
+       "                                         or from start of mtd `partition'\n"
+       "                                        `+len' round up `len' to block size\n"
+       "sf update addr offset|partition len    - erase and write `len' bytes from memory\n"
+       "                                         at `addr' to flash at `offset'\n"
+       "                                         or to start of mtd `partition'\n"
        SF_TEST_HELP
 );