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 tag 'mips-fixes-for-2019.07' of https://gitlab.denx.de/u-boot/custodians/u...
[platform/kernel/u-boot.git]
/
common
/
image.c
diff --git
a/common/image.c
b/common/image.c
index
4d4248f
..
75b84d5
100644
(file)
--- a/
common/image.c
+++ b/
common/image.c
@@
-957,7
+957,7
@@
int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
*/
buf = map_sysmem(images->os.start, 0);
if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
- select = argv[0];
+ select =
(argc == 0) ? env_get("loadaddr") :
argv[0];
#endif
if (argc >= 2)