From: Tom Rini Date: Thu, 27 Aug 2015 19:42:41 +0000 (-0400) Subject: common/image.c: Make boot_get_ramdisk() perform a check for Android images X-Git-Tag: v2015.10-rc5~8 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1fec3c5;p=u-boot common/image.c: Make boot_get_ramdisk() perform a check for Android images In 2dd4632 the check for where a ramdisk is found on an Android image was got moved into the "normal" loop here, causing people to have to pass the kernel address in the ramdisk address location in order to have Android boot still. This changed previous behavior so perform a check early in the function to see if we have an Android image and if so use that as where to look for the ramdisk (which is what the rest of the code here expects). We allow for this to still be overridden with an explicit ramdisk address to be passed as normal. Cc: Rob Herring Reported-by: Paul Kocialkowski Signed-off-by: Tom Rini --- diff --git a/common/image.c b/common/image.c index c33749d51d..e6071099d6 100644 --- a/common/image.c +++ b/common/image.c @@ -908,6 +908,15 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, *rd_start = 0; *rd_end = 0; +#ifdef CONFIG_ANDROID_BOOT_IMAGE + /* + * Look for an Android boot image. + */ + buf = map_sysmem(images->os.start, 0); + if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) + select = argv[0]; +#endif + if (argc >= 2) select = argv[1];