bootm: Move arm64-image processing later

If the image is compressed, then the existing check fails, since the
header is wrong.

Move the check later in the boot process, after the kernel is
decompressed. This allows use of bootm with compressed kernels, while
still permitting an uncompressed kernel to be used.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/bootm.c b/boot/bootm.c
index cb61485..e051a0c 100644 (file)
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -240,24 +240,8 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc,
        }
 
        if (images.os.type == IH_TYPE_KERNEL_NOLOAD) {
-               if (IS_ENABLED(CONFIG_CMD_BOOTI) &&
-                   images.os.arch == IH_ARCH_ARM64 &&
-                   images.os.os == IH_OS_LINUX) {
-                       ulong image_addr;
-                       ulong image_size;
-
-                       ret = booti_setup(images.os.image_start, &image_addr,
-                                         &image_size, true);
-                       if (ret != 0)
-                               return 1;
-
-                       images.os.type = IH_TYPE_KERNEL;
-                       images.os.load = image_addr;
-                       images.ep = image_addr;
-               } else {
-                       images.os.load = images.os.image_start;
-                       images.ep += images.os.image_start;
-               }
+               images.os.load = images.os.image_start;
+               images.ep += images.os.image_start;
        }
 
        images.os.start = map_to_sysmem(os_hdr);
@@ -466,6 +450,31 @@ static int bootm_load_os(struct bootm_headers *images, int boot_progress)
                }
        }
 
+       if (IS_ENABLED(CONFIG_CMD_BOOTI) && images->os.arch == IH_ARCH_ARM64 &&
+           images->os.os == IH_OS_LINUX) {
+               ulong relocated_addr;
+               ulong image_size;
+               int ret;
+
+               ret = booti_setup(load, &relocated_addr, &image_size, false);
+               if (ret) {
+                       printf("Failed to prep arm64 kernel (err=%d)\n", ret);
+                       return BOOTM_ERR_RESET;
+               }
+
+               /* Handle BOOTM_STATE_LOADOS */
+               if (relocated_addr != load) {
+                       printf("Moving Image from 0x%lx to 0x%lx, end=%lx\n",
+                              load, relocated_addr,
+                              relocated_addr + image_size);
+                       memmove((void *)relocated_addr, load_buf, image_size);
+               }
+
+               images->ep = relocated_addr;
+               images->os.start = relocated_addr;
+               images->os.end = relocated_addr + image_size;
+       }
+
        lmb_reserve(&images->lmb, images->os.load, (load_end -
                                                    images->os.load));
        return 0;