Merge git://git.denx.de/u-boot-ubi

[people/ms/u-boot.git] / cmd / booti.c

diff --git a/cmd/booti.c b/cmd/booti.c
index 2d879f39f5a6983e940656b28ba0acc1839919d2..fff936976355e1f261eca5eb7ae9ce49d994691f 100644 (file)
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -11,66 +11,11 @@
 #include <image.h>
 #include <lmb.h>
 #include <mapmem.h>
+#include <linux/kernel.h>
+#include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* See Documentation/arm64/booting.txt in the Linux kernel */
-struct Image_header {
-       uint32_t        code0;          /* Executable code */
-       uint32_t        code1;          /* Executable code */
-       uint64_t        text_offset;    /* Image load offset, LE */
-       uint64_t        image_size;     /* Effective Image size, LE */
-       uint64_t        res1;           /* reserved */
-       uint64_t        res2;           /* reserved */
-       uint64_t        res3;           /* reserved */
-       uint64_t        res4;           /* reserved */
-       uint32_t        magic;          /* Magic number */
-       uint32_t        res5;
-};
-
-#define LINUX_ARM64_IMAGE_MAGIC        0x644d5241
-
-static int booti_setup(bootm_headers_t *images)
-{
-       struct Image_header *ih;
-       uint64_t dst;
-       uint64_t image_size;
-
-       ih = (struct Image_header *)map_sysmem(images->ep, 0);
-
-       if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) {
-               puts("Bad Linux ARM64 Image magic!\n");
-               return 1;
-       }
-       
-       if (ih->image_size == 0) {
-               puts("Image lacks image_size field, assuming 16MiB\n");
-               image_size = 16 << 20;
-       } else {
-               image_size = le64_to_cpu(ih->image_size);
-       }
-
-       /*
-        * If we are not at the correct run-time location, set the new
-        * correct location and then move the image there.
-        */
-       dst = gd->bd->bi_dram[0].start + le64_to_cpu(ih->text_offset);
-
-       unmap_sysmem(ih);
-
-       if (images->ep != dst) {
-               void *src;
-
-               debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst);
-
-               src = (void *)images->ep;
-               images->ep = dst;
-               memmove((void *)dst, src, image_size);
-       }
-
-       return 0;
-}
-
 /*
  * Image booting support
  */
@@ -78,31 +23,35 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
                        char * const argv[], bootm_headers_t *images)
 {
        int ret;
-       struct Image_header *ih;
+       ulong ld;
+       ulong relocated_addr;
+       ulong image_size;
 
        ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
                              images, 1);
 
        /* Setup Linux kernel Image entry point */
        if (!argc) {
-               images->ep = load_addr;
+               ld = load_addr;
                debug("*  kernel: default image load address = 0x%08lx\n",
                                load_addr);
        } else {
-               images->ep = simple_strtoul(argv[0], NULL, 16);
-               debug("*  kernel: cmdline image address = 0x%08lx\n",
-                       images->ep);
+               ld = simple_strtoul(argv[0], NULL, 16);
+               debug("*  kernel: cmdline image address = 0x%08lx\n", ld);
        }
 
-       ret = booti_setup(images);
+       ret = booti_setup(ld, &relocated_addr, &image_size);
        if (ret != 0)
                return 1;
 
-       ih = (struct Image_header *)map_sysmem(images->ep, 0);
-
-       lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size));
+       /* Handle BOOTM_STATE_LOADOS */
+       if (relocated_addr != ld) {
+               debug("Moving Image from 0x%lx to 0x%lx\n", ld, relocated_addr);
+               memmove((void *)relocated_addr, (void *)ld, image_size);
+       }
 
-       unmap_sysmem(ih);
+       images->ep = relocated_addr;
+       lmb_reserve(&images->lmb, images->ep, le32_to_cpu(image_size));
 
        /*
         * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
@@ -131,6 +80,7 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bootm_disable_interrupts();
 
        images.os.os = IH_OS_LINUX;
+       images.os.arch = IH_ARCH_ARM64;
        ret = do_bootm_states(cmdtp, flag, argc, argv,
 #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
                              BOOTM_STATE_RAMDISK |