projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of ../next
[platform/kernel/u-boot.git]
/
common
/
image.c
diff --git
a/common/image.c
b/common/image.c
index
5cc3ab4
..
82e7aa4
100644
(file)
--- a/
common/image.c
+++ b/
common/image.c
@@
-436,11
+436,7
@@
phys_size_t getenv_bootm_size(void)
char *s = getenv ("bootm_size");
if (s) {
phys_size_t tmp;
-#ifdef CONFIG_SYS_64BIT_STRTOUL
tmp = (phys_size_t)simple_strtoull (s, NULL, 16);
-#else
- tmp = (phys_size_t)simple_strtoul (s, NULL, 16);
-#endif
return tmp;
}