diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-27 19:04:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-27 19:06:17 -0400 |
| commit | c139b5ff0999ec3d44a02ebdb623a92e5782e53e (patch) | |
| tree | 5da9fe94b9107017f0c23fd9573f6e73f1028ab6 /common | |
| parent | 248f260cbd23f1a5f5d7a9aebdf2bd8253e0d04b (diff) | |
| download | blackbird-obmc-uboot-c139b5ff0999ec3d44a02ebdb623a92e5782e53e.tar.gz blackbird-obmc-uboot-c139b5ff0999ec3d44a02ebdb623a92e5782e53e.zip | |
image.c: Fix non-Android booting with ramdisk and/or device tree
In 1fec3c5 I added a check that if we had an Android image we default to
trying the kernel address for a ramdisk. However when we don't have an
Android image buf is NULL and we oops here. Ensure that we have 'buf'
to check first.
Reported-by: elipe Balbi <balbi@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -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 |
