summaryrefslogtreecommitdiff
path: root/tools/mxsimage.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-01-10 10:56:00 -0500
committerTom Rini <trini@ti.com>2014-01-10 10:56:00 -0500
commit7f673c99c2d8d1aa21996c5b914f06d784b080ca (patch)
treedf68108a0bd7326dc6299b96853b769220c55470 /tools/mxsimage.c
parent8401bfa91ef57e331e2a3abdf768d41803bec88e (diff)
parent10a147bc665367111920be657409a5d56d3c0590 (diff)
downloadu-boot-imx-7f673c99c2d8d1aa21996c5b914f06d784b080ca.zip
u-boot-imx-7f673c99c2d8d1aa21996c5b914f06d784b080ca.tar.gz
u-boot-imx-7f673c99c2d8d1aa21996c5b914f06d784b080ca.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Bringing in the MMC tree means that CONFIG_BOUNCE_BUFFER needed to be added to include/configs/exynos5-dt.h now. Conflicts: include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'tools/mxsimage.c')
-rw-r--r--tools/mxsimage.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/mxsimage.c b/tools/mxsimage.c
index b214050..045b35a 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");