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>

diff --git a/common/bootm.c b/common/bootm.c
index 17ed3897f99391cbc0eb8f962d46ae138a4d1d17..81e32617c30c4f0a329e9f85dfaf85d142c334f8 100644 (file)
--- 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:

diff --git a/common/image-android.c b/common/image-android.c
index 6ded7e2c97ef6d0925895b3439d0f18c694e6562..59079fc32b51df99bca78e09605b93b519153714 100644 (file)
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -7,9 +7,26 @@
 #include <common.h>
 #include <image.h>
 #include <android_image.h>
+#include <malloc.h>
+#include <errno.h>
 
 static char andr_tmp_str[ANDR_BOOT_ARGS_SIZE + 1];
 
+/**
+ * android_image_get_kernel() - processes kernel part of Android boot images
+ * @hdr:       Pointer to image header, which is at the start
+ *                     of the image.
+ * @verify:    Checksum verification flag. Currently unimplemented.
+ * @os_data:   Pointer to a ulong variable, will hold os data start
+ *                     address.
+ * @os_len:    Pointer to a ulong variable, will hold os data length.
+ *
+ * This function returns the os image's start address and length. Also,
+ * it appends the kernel command line to the bootargs env variable.
+ *
+ * Return: Zero, os start address and length on success,
+ *             otherwise on failure.
+ */
 int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
                             ulong *os_data, ulong *os_len)
 {
@@ -25,16 +42,32 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
 
        printf("Kernel load addr 0x%08x size %u KiB\n",
               hdr->kernel_addr, DIV_ROUND_UP(hdr->kernel_size, 1024));
-       strncpy(andr_tmp_str, hdr->cmdline, ANDR_BOOT_ARGS_SIZE);
-       andr_tmp_str[ANDR_BOOT_ARGS_SIZE] = '\0';
-       if (strlen(andr_tmp_str)) {
-               printf("Kernel command line: %s\n", andr_tmp_str);
-               setenv("bootargs", andr_tmp_str);
+
+       int len = 0;
+       if (*hdr->cmdline) {
+               printf("Kernel command line: %s\n", hdr->cmdline);
+               len += strlen(hdr->cmdline);
+       }
+
+       char *bootargs = getenv("bootargs");
+       if (bootargs)
+               len += strlen(bootargs);
+
+       char *newbootargs = malloc(len + 2);
+       if (!newbootargs) {
+               puts("Error: malloc in android_image_get_kernel failed!\n");
+               return -ENOMEM;
+       }
+       *newbootargs = '\0';
+
+       if (bootargs) {
+               strcpy(newbootargs, bootargs);
+               strcat(newbootargs, " ");
        }
-       if (hdr->ramdisk_size)
-               printf("RAM disk load addr 0x%08x size %u KiB\n",
-                      hdr->ramdisk_addr,
-                      DIV_ROUND_UP(hdr->ramdisk_size, 1024));
+       if (*hdr->cmdline)
+               strcat(newbootargs, hdr->cmdline);
+
+       setenv("bootargs", newbootargs);
 
        if (os_data) {
                *os_data = (ulong)hdr;
@@ -52,17 +85,18 @@ int android_image_check_header(const struct andr_img_hdr *hdr)
 
 ulong android_image_get_end(const struct andr_img_hdr *hdr)
 {
-       u32 size = 0;
+       ulong end;
        /*
         * The header takes a full page, the remaining components are aligned
         * on page boundary
         */
-       size += hdr->page_size;
-       size += ALIGN(hdr->kernel_size, hdr->page_size);
-       size += ALIGN(hdr->ramdisk_size, hdr->page_size);
-       size += ALIGN(hdr->second_size, hdr->page_size);
+       end = (ulong)hdr;
+       end += hdr->page_size;
+       end += ALIGN(hdr->kernel_size, hdr->page_size);
+       end += ALIGN(hdr->ramdisk_size, hdr->page_size);
+       end += ALIGN(hdr->second_size, hdr->page_size);
 
-       return size;
+       return end;
 }
 
 ulong android_image_get_kload(const struct andr_img_hdr *hdr)
@@ -75,6 +109,10 @@ int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
 {
        if (!hdr->ramdisk_size)
                return -1;
+
+       printf("RAM disk load addr 0x%08x size %u KiB\n",
+              hdr->ramdisk_addr, DIV_ROUND_UP(hdr->ramdisk_size, 1024));
+
        *rd_data = (unsigned long)hdr;
        *rd_data += hdr->page_size;
        *rd_data += ALIGN(hdr->kernel_size, hdr->page_size);

diff --git a/common/image.c b/common/image.c
index 640e83b7bdf8013d02416615faf796c483a12d0f..eb92e6323c03e55ee3e0025a17641bed60b40a59 100644 (file)
--- 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 */