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 <[email protected]> > Reported-by: Paul Kocialkowski <[email protected]> > Signed-off-by: Tom Rini <[email protected]> > --- > 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
signature.asc
Description: This is a digitally signed message part
_______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
