Commit 9950098e authored by Rob Herring's avatar Rob Herring Committed by Tom Rini

image: fix support for Android boot images with no ramdisk

If an Android boot image does not contain a ramdisk, make sure rd_len
and rd_data are returned to indicate no ramdisk rather than just relying
on returning an error.
Signed-off-by: default avatarRob Herring <>
parent 027b728d
......@@ -130,8 +130,10 @@ ulong android_image_get_kload(const struct andr_img_hdr *hdr)
int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
ulong *rd_data, ulong *rd_len)
if (!hdr->ramdisk_size)
if (!hdr->ramdisk_size) {
*rd_data = *rd_len = 0;
return -1;
printf("RAM disk load addr 0x%08x size %u KiB\n",
hdr->ramdisk_addr, DIV_ROUND_UP(hdr->ramdisk_size, 1024));
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment