From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Kocialkowski Date: Tue, 01 Sep 2015 15:50:29 +0200 Subject: [U-Boot] [PATCH] common/image.c: Make boot_get_ramdisk() perform a check for Android images In-Reply-To: <1440704561-17015-1-git-send-email-trini@konsulko.com> References: <1440704561-17015-1-git-send-email-trini@konsulko.com> Message-ID: <1441115429.4123.1.camel@collins> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Le jeudi 27 ao?t 2015 ? 15:42 -0400, Tom Rini a ?crit : > 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). That patch does fix my problem (the ramdisk is now correctly passed to the kernel). I suggest that you merge it ASAP. Thanks! > Cc: Rob Herring > Reported-by: Paul Kocialkowski > Signed-off-by: Tom Rini > --- > common/image.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/common/image.c b/common/image.c > index ca721c5..e938bea 100644 > --- a/common/image.c > +++ b/common/image.c > @@ -907,6 +907,15 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, > if (argc >= 2) > select = argv[1]; > > +#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 > + > /* > * Look for a '-' which indicates to ignore the > * ramdisk argument -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part URL: