colibri_imx6: fix video stdout in default environment

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

diff --git a/common/image-android.c b/common/image-android.c
index 6af9baa121dbab45a827454b41f02bff895e657f..18f7c8db03ba7284d78d1c1723fd97988093ee0e 100644 (file)
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -33,6 +33,13 @@ static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr)
        if (hdr->kernel_addr == ANDROID_IMAGE_DEFAULT_KERNEL_ADDR)
                return (ulong)hdr + hdr->page_size;
 
+       /*
+        * abootimg creates images where all load addresses are 0
+        * and we need to fix them.
+        */
+       if (hdr->kernel_addr == 0 && hdr->ramdisk_addr == 0)
+               return env_get_ulong("kernel_addr_r", 16, 0);
+
        return hdr->kernel_addr;
 }