diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-13 20:04:11 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 20:04:11 (GMT) |
commit | f16b608ae7d0c4611d3a41d2570616a498e64d4c (patch) | |
tree | 213c9f261e590c22f21683a619d997a895ada35b /common | |
parent | 107b56bdd8e82b07458df11f8df4a01067512281 (diff) | |
parent | 1c091f59a03af9f2e821cb054fd555a2748dd091 (diff) | |
download | u-boot-fsl-qoriq-f16b608ae7d0c4611d3a41d2570616a498e64d4c.tar.xz |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'common')
-rw-r--r-- | common/cmd_sf.c | 111 |
1 files changed, 75 insertions, 36 deletions
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 6e7be81..11a491d 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -19,6 +19,47 @@ static struct spi_flash *flash; + +/* + * This function computes the length argument for the erase command. + * The length on which the command is to operate can be given in two forms: + * 1. <cmd> offset len - operate on <'offset', 'len') + * 2. <cmd> offset +len - operate on <'offset', 'round_up(len)') + * If the second form is used and the length doesn't fall on the + * sector boundary, than it will be adjusted to the next sector boundary. + * If it isn't in the flash, the function will fail (return -1). + * Input: + * arg: length specification (i.e. both command arguments) + * Output: + * len: computed length for operation + * Return: + * 1: success + * -1: failure (bad format, bad address). + */ +static int sf_parse_len_arg(char *arg, ulong *len) +{ + char *ep; + char round_up_len; /* indicates if the "+length" form used */ + ulong len_arg; + + round_up_len = 0; + if (*arg == '+') { + round_up_len = 1; + ++arg; + } + + len_arg = simple_strtoul(arg, &ep, 16); + if (ep == arg || *ep != '\0') + return -1; + + if (round_up_len && flash->sector_size > 0) + *len = ROUND(len_arg - 1, flash->sector_size); + else + *len = len_arg; + + return 1; +} + static int do_spi_flash_probe(int argc, char * const argv[]) { unsigned int bus = 0; @@ -29,30 +70,30 @@ static int do_spi_flash_probe(int argc, char * const argv[]) struct spi_flash *new; if (argc < 2) - goto usage; + return -1; cs = simple_strtoul(argv[1], &endp, 0); if (*argv[1] == 0 || (*endp != 0 && *endp != ':')) - goto usage; + return -1; if (*endp == ':') { if (endp[1] == 0) - goto usage; + return -1; bus = cs; cs = simple_strtoul(endp + 1, &endp, 0); if (*endp != 0) - goto usage; + return -1; } if (argc >= 3) { speed = simple_strtoul(argv[2], &endp, 0); if (*argv[2] == 0 || *endp != 0) - goto usage; + return -1; } if (argc >= 4) { mode = simple_strtoul(argv[3], &endp, 16); if (*argv[3] == 0 || *endp != 0) - goto usage; + return -1; } new = spi_flash_probe(bus, cs, speed, mode); @@ -65,14 +106,7 @@ static int do_spi_flash_probe(int argc, char * const argv[]) spi_flash_free(flash); flash = new; - printf("%u KiB %s at %u:%u is now current device\n", - flash->size >> 10, flash->name, bus, cs); - return 0; - -usage: - puts("Usage: sf probe [bus:]cs [hz] [mode]\n"); - return 1; } static int do_spi_flash_read_write(int argc, char * const argv[]) @@ -85,17 +119,17 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) int ret; if (argc < 4) - goto usage; + return -1; addr = simple_strtoul(argv[1], &endp, 16); if (*argv[1] == 0 || *endp != 0) - goto usage; + return -1; offset = simple_strtoul(argv[2], &endp, 16); if (*argv[2] == 0 || *endp != 0) - goto usage; + return -1; len = simple_strtoul(argv[3], &endp, 16); if (*argv[3] == 0 || *endp != 0) - goto usage; + return -1; buf = map_physmem(addr, len, MAP_WRBACK); if (!buf) { @@ -116,10 +150,6 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) } return 0; - -usage: - printf("Usage: sf %s addr offset len\n", argv[0]); - return 1; } static int do_spi_flash_erase(int argc, char * const argv[]) @@ -130,14 +160,15 @@ static int do_spi_flash_erase(int argc, char * const argv[]) int ret; if (argc < 3) - goto usage; + return -1; offset = simple_strtoul(argv[1], &endp, 16); if (*argv[1] == 0 || *endp != 0) - goto usage; - len = simple_strtoul(argv[2], &endp, 16); - if (*argv[2] == 0 || *endp != 0) - goto usage; + return -1; + + ret = sf_parse_len_arg(argv[2], &len); + if (ret != 1) + return -1; ret = spi_flash_erase(flash, offset, len); if (ret) { @@ -146,24 +177,25 @@ static int do_spi_flash_erase(int argc, char * const argv[]) } return 0; - -usage: - puts("Usage: sf erase offset len\n"); - return 1; } static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { const char *cmd; + int ret; /* need at least two arguments */ if (argc < 2) goto usage; cmd = argv[1]; + --argc; + ++argv; - if (strcmp(cmd, "probe") == 0) - return do_spi_flash_probe(argc - 1, argv + 1); + if (strcmp(cmd, "probe") == 0) { + ret = do_spi_flash_probe(argc, argv); + goto done; + } /* The remaining commands require a selected device */ if (!flash) { @@ -172,9 +204,15 @@ static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ } if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0) - return do_spi_flash_read_write(argc - 1, argv + 1); - if (strcmp(cmd, "erase") == 0) - return do_spi_flash_erase(argc - 1, argv + 1); + ret = do_spi_flash_read_write(argc, argv); + else if (strcmp(cmd, "erase") == 0) + ret = do_spi_flash_erase(argc, argv); + else + ret = -1; + +done: + if (ret != -1) + return ret; usage: return cmd_usage(cmdtp); @@ -189,5 +227,6 @@ U_BOOT_CMD( " `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'" + "sf erase offset [+]len - erase `len' bytes from `offset'\n" + " `+len' round up `len' to block size" ); |