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/bootm.c | |
| parent | 11ab5be89df51889c407462b5289eddc2abe9c27 (diff) | |
| download | blackbird-obmc-uboot-86f4695bd0dd82913936540593bfa8e74fdb98f3.tar.gz blackbird-obmc-uboot-86f4695bd0dd82913936540593bfa8e74fdb98f3.zip | |
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/bootm.c')
| -rw-r--r-- | common/bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/bootm.c b/common/bootm.c index 17ed3897f9..81e32617c3 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -154,11 +154,11 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc, images.os.type = IH_TYPE_KERNEL; images.os.comp = IH_COMP_NONE; images.os.os = IH_OS_LINUX; - images.ep = images.os.load; - ep_found = true; images.os.end = android_image_get_end(os_hdr); images.os.load = android_image_get_kload(os_hdr); + images.ep = images.os.load; + ep_found = true; break; #endif default: |
