From: Rob Herring <robh@kernel.org>
Date: Mon, 5 Oct 2015 19:37:07 +0000 (-0500)
Subject: image: fix support for Android boot images with no ramdisk
X-Git-Tag: v2015.10-rc5~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9950098e31004fdfb94c8c6ce3f4b27566a532bd;p=u-boot

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: Rob Herring <robh@kernel.org>
---

diff --git a/common/image-android.c b/common/image-android.c
index d946c2f814..b6a94b3a30 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -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));