diff options
| author | Ahmad Draidi <ar2000jp@gmail.com> | 2014-10-23 20:50:07 +0300 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 17:54:12 -0400 |
| commit | 86f4695bd0dd82913936540593bfa8e74fdb98f3 (patch) | |
| tree | 2cceda3c79eaae173679b019195f3cf3eb9fdbf2 /common/image.c | |
| parent | 11ab5be89df51889c407462b5289eddc2abe9c27 (diff) | |
| download | u-boot-imx-86f4695bd0dd82913936540593bfa8e74fdb98f3.zip u-boot-imx-86f4695bd0dd82913936540593bfa8e74fdb98f3.tar.gz u-boot-imx-86f4695bd0dd82913936540593bfa8e74fdb98f3.tar.bz2 | |
image: Fix Android boot image support
This patch makes the following changes:
- Set kernel entry point correctly
- Append bootargs from image to global bootargs instead
of replacing them
- Return end address instead of size from android_image_get_end()
- Give correct parameter to genimg_get_format() in boot_get_ramdisk()
- Move ramdisk message printing from android_image_get_kernel() to
android_image_get_ramdisk()
Signed-off-by: Ahmad Draidi <ar2000jp@gmail.com>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/image.c b/common/image.c index 640e83b..eb92e63 100644 --- a/common/image.c +++ b/common/image.c @@ -1010,7 +1010,8 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, image_multi_getimg(images->legacy_hdr_os, 1, &rd_data, &rd_len); } #ifdef CONFIG_ANDROID_BOOT_IMAGE - else if ((genimg_get_format(images) == IMAGE_FORMAT_ANDROID) && + else if ((genimg_get_format((void *)images->os.start) + == IMAGE_FORMAT_ANDROID) && (!android_image_get_ramdisk((void *)images->os.start, &rd_data, &rd_len))) { /* empty */ |