From: Eugeniu Rosca <erosca@de.adit-jv.com>
Date: Mon, 1 Apr 2019 10:45:36 +0000 (+0200)
Subject: fdt: boot_get_fdt: android: compress handling (non-functional)
X-Git-Tag: v2019.07-rc1~7^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18b8f2c49e9b0620caf5b661986c01c575e29b9b;p=oweals%2Fu-boot.git

fdt: boot_get_fdt: android: compress handling (non-functional)

Prepare for booting Android images which lack any DTB in the second
area by using 'fdtaddr' environment variable as source/address of FDT.
No functional/behavioral change expected in this patch.

Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 68bcab85ba..a5d8b41d02 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -461,17 +461,16 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 		struct andr_img_hdr *hdr = buf;
 		ulong fdt_data, fdt_len;
 
-		if (android_image_get_second(hdr, &fdt_data, &fdt_len) != 0)
-			goto no_fdt;
+		if (!android_image_get_second(hdr, &fdt_data, &fdt_len) &&
+		    !fdt_check_header((char *)fdt_data)) {
+			fdt_blob = (char *)fdt_data;
+			if (fdt_totalsize(fdt_blob) != fdt_len)
+				goto error;
 
-		fdt_blob = (char *)fdt_data;
-		if (fdt_check_header(fdt_blob) != 0)
+			debug("## Using FDT in Android image second area\n");
+		} else {
 			goto no_fdt;
-
-		if (fdt_totalsize(fdt_blob) != fdt_len)
-			goto error;
-
-		debug("## Using FDT found in Android image second area\n");
+		}
 #endif
 	} else {
 		debug("## No Flattened Device Tree\n");