diff options
| author | Tom Rini <trini@ti.com> | 2014-01-13 13:45:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-01-13 13:45:15 -0500 |
| commit | 10fcda8e25cb9477b47a62edb716f81c9d5e1f0e (patch) | |
| tree | b705f678c1eb1161227c6e1996a0d5c008ea4b64 /common | |
| parent | d104a0c6a19da2d35cfae447e909b5bda727895a (diff) | |
| parent | 35a55fb57fffb615e6b20980fb317e162076adb4 (diff) | |
| download | u-boot-imx-10fcda8e25cb9477b47a62edb716f81c9d5e1f0e.zip u-boot-imx-10fcda8e25cb9477b47a62edb716f81c9d5e1f0e.tar.gz u-boot-imx-10fcda8e25cb9477b47a62edb716f81c9d5e1f0e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_sf.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 3994b06..b4ceb71 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -358,7 +358,8 @@ static void show_time(struct test_info *test, int stage) int bps; /* Bits per second */ speed = (long long)test->bytes * 1000; - do_div(speed, test->time_ms[stage] * 1024); + if (test->time_ms[stage]) + do_div(speed, test->time_ms[stage] * 1024); bps = speed * 8; printf("%d %s: %d ticks, %d KiB/s %d.%03d Mbps\n", stage, @@ -446,11 +447,13 @@ static int do_spi_flash_test(int argc, char * const argv[]) { unsigned long offset; unsigned long len; - uint8_t *buf = (uint8_t *)CONFIG_SYS_TEXT_BASE; + uint8_t *buf, *from; char *endp; uint8_t *vbuf; int ret; + if (argc < 3) + return -1; offset = simple_strtoul(argv[1], &endp, 16); if (*argv[1] == 0 || *endp != 0) return -1; @@ -460,17 +463,18 @@ static int do_spi_flash_test(int argc, char * const argv[]) vbuf = malloc(len); if (!vbuf) { - printf("Cannot allocate memory\n"); + printf("Cannot allocate memory (%lu bytes)\n", len); return 1; } buf = malloc(len); if (!buf) { free(vbuf); - printf("Cannot allocate memory\n"); + printf("Cannot allocate memory (%lu bytes)\n", len); return 1; } - memcpy(buf, (char *)CONFIG_SYS_TEXT_BASE, len); + from = map_sysmem(CONFIG_SYS_TEXT_BASE, 0); + memcpy(buf, from, len); ret = spi_flash_test(flash, buf, len, offset, vbuf); free(vbuf); free(buf); |