summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-06 08:49:58 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-06 08:49:58 +0100
commita891601ce51edbafa1a2750c96a618e4fcbca1c2 (patch)
tree9a5d44eb1fcca45dfd30557318f786b66392a8f3 /tools
parent2931fa4db349c97f882ffda42e901208654b5ca9 (diff)
parent4611d5bab26f93471b84f6f33967cef69b3f723a (diff)
downloadu-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.zip
u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.gz
u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace.
Diffstat (limited to 'tools')
-rw-r--r--tools/mxsimage.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/mxsimage.c b/tools/mxsimage.c
index 5db19b2..7bd9dee 100644
--- a/tools/mxsimage.c
+++ b/tools/mxsimage.c
@@ -502,6 +502,7 @@ static int sb_token_to_long(char *tok, uint32_t *rid)
tok += 2;
+ errno = 0;
id = strtoul(tok, &endptr, 16);
if ((errno == ERANGE && id == ULONG_MAX) || (errno != 0 && id == 0)) {
fprintf(stderr, "ERR: Value can't be decoded!\n");