spl: Correct call to spl_common_init() with SPL_STACK_R_MALLOC_SIMPLE_LEN

[people/ms/u-boot.git] / common / image-android.c

diff --git a/common/image-android.c b/common/image-android.c
index 59079fc32b51df99bca78e09605b93b519153714..ee03b96aaa83d55df3292ce5407850a62e82d1c5 100644 (file)
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -10,8 +10,29 @@
 #include <malloc.h>
 #include <errno.h>
 
+#define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR      0x10008000
+
 static char andr_tmp_str[ANDR_BOOT_ARGS_SIZE + 1];
 
+static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr)
+{
+       /*
+        * All the Android tools that generate a boot.img use this
+        * address as the default.
+        *
+        * Even though it doesn't really make a lot of sense, and it
+        * might be valid on some platforms, we treat that adress as
+        * the default value for this field, and try to execute the
+        * kernel in place in such a case.
+        *
+        * Otherwise, we will return the actual value set by the user.
+        */
+       if (hdr->kernel_addr == ANDROID_IMAGE_DEFAULT_KERNEL_ADDR)
+               return (ulong)hdr + hdr->page_size;
+
+       return hdr->kernel_addr;
+}
+
 /**
  * android_image_get_kernel() - processes kernel part of Android boot images
  * @hdr:       Pointer to image header, which is at the start
@@ -30,6 +51,8 @@ static char andr_tmp_str[ANDR_BOOT_ARGS_SIZE + 1];
 int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
                             ulong *os_data, ulong *os_len)
 {
+       u32 kernel_addr = android_image_get_kernel_addr(hdr);
+
        /*
         * Not all Android tools use the id field for signing the image with
         * sha1 (or anything) so we don't check it. It is not obvious that the
@@ -41,7 +64,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
                printf("Android's image name: %s\n", andr_tmp_str);
 
        printf("Kernel load addr 0x%08x size %u KiB\n",
-              hdr->kernel_addr, DIV_ROUND_UP(hdr->kernel_size, 1024));
+              kernel_addr, DIV_ROUND_UP(hdr->kernel_size, 1024));
 
        int len = 0;
        if (*hdr->cmdline) {
@@ -101,14 +124,16 @@ ulong android_image_get_end(const struct andr_img_hdr *hdr)
 
 ulong android_image_get_kload(const struct andr_img_hdr *hdr)
 {
-       return hdr->kernel_addr;
+       return android_image_get_kernel_addr(hdr);
 }
 
 int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
                              ulong *rd_data, ulong *rd_len)
 {
-       if (!hdr->ramdisk_size)
+       if (!hdr->ramdisk_size) {
+               *rd_data = *rd_len = 0;
                return -1;
+       }
 
        printf("RAM disk load addr 0x%08x size %u KiB\n",
               hdr->ramdisk_addr, DIV_ROUND_UP(hdr->ramdisk_size, 1024));
@@ -120,3 +145,32 @@ int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
        *rd_len = hdr->ramdisk_size;
        return 0;
 }
+
+#if !defined(CONFIG_SPL_BUILD)
+/**
+ * android_print_contents - prints out the contents of the Android format image
+ * @hdr: pointer to the Android format image header
+ *
+ * android_print_contents() formats a multi line Android image contents
+ * description.
+ * The routine prints out Android image properties
+ *
+ * returns:
+ *     no returned results
+ */
+void android_print_contents(const struct andr_img_hdr *hdr)
+{
+       const char * const p = IMAGE_INDENT_STRING;
+
+       printf("%skernel size:      %x\n", p, hdr->kernel_size);
+       printf("%skernel address:   %x\n", p, hdr->kernel_addr);
+       printf("%sramdisk size:     %x\n", p, hdr->ramdisk_size);
+       printf("%sramdisk addrress: %x\n", p, hdr->ramdisk_addr);
+       printf("%ssecond size:      %x\n", p, hdr->second_size);
+       printf("%ssecond address:   %x\n", p, hdr->second_addr);
+       printf("%stags address:     %x\n", p, hdr->tags_addr);
+       printf("%spage size:        %x\n", p, hdr->page_size);
+       printf("%sname:             %s\n", p, hdr->name);
+       printf("%scmdline:          %s\n", p, hdr->cmdline);
+}
+#endif