diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
| commit | e573bdb324c78fac56655a493bea843842c9d9f8 (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /common/image.c | |
| parent | a69fdc7787bfa2f27eed74c2ee58c28ce932d502 (diff) | |
| parent | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/image.c b/common/image.c index e6071099d6..85c4f39cdf 100644 --- a/common/image.c +++ b/common/image.c @@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, * Look for an Android boot image. */ buf = map_sysmem(images->os.start, 0); - if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) + if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) select = argv[0]; #endif |