summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-08-04 21:54:11 +0200
committerWolfgang Denk <wd@denx.de>2009-08-04 21:54:11 +0200
commitcb32ed1fc298875845f166d326a3f2704a0d5364 (patch)
tree0bfddffa6c6457f87fffd4dd49ebf9698d45bf87 /common
parent06bffc6ea52d4b390843d295d438b2037d12e5fd (diff)
parent052c08916532d1d9c2f69eb9229709c7b2fc1f02 (diff)
downloadu-boot-imx-cb32ed1fc298875845f166d326a3f2704a0d5364.zip
u-boot-imx-cb32ed1fc298875845f166d326a3f2704a0d5364.tar.gz
u-boot-imx-cb32ed1fc298875845f166d326a3f2704a0d5364.tar.bz2
Merge branch 'next' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'common')
-rw-r--r--common/cmd_sf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index 2d463a8..d571f60 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -48,7 +48,7 @@ static int do_spi_flash_probe(int argc, char *argv[])
goto usage;
}
if (argc >= 4) {
- mode = simple_strtoul(argv[3], &endp, 0);
+ mode = simple_strtoul(argv[3], &endp, 16);
if (*argv[3] == 0 || *endp != 0)
goto usage;
}