leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eugeniu Rosca 2019-04-01 12:45:36 +02:00 committed by Simon Glass
parent 80281829a6
commit 18b8f2c49e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/image-fdt.c
View File

@ -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)
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;
debug("## Using FDT in Android image second area\n");
} else {
goto no_fdt;
fdt_blob = (char *)fdt_data;
if (fdt_check_header(fdt_blob) != 0)
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");