command: Remove the cmd_tbl_t typedef

[J-u-boot.git] / cmd / booti.c

diff --git a/cmd/booti.c b/cmd/booti.c
index c36b0235df8c79aea703a3bacdbda1c636858fac..ead233263116f7f2323378aa337030e49b19c2d9 100644 (file)
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -8,35 +8,70 @@
 #include <bootm.h>
 #include <command.h>
 #include <image.h>
+#include <irq_func.h>
 #include <lmb.h>
 #include <mapmem.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 /*
  * Image booting support
  */
-static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[], bootm_headers_t *images)
+static int booti_start(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[], bootm_headers_t *images)
 {
        int ret;
        ulong ld;
        ulong relocated_addr;
        ulong image_size;
+       uint8_t *temp;
+       ulong dest;
+       ulong dest_end;
+       unsigned long comp_len;
+       unsigned long decomp_len;
+       int ctype;
 
        ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
                              images, 1);
 
        /* Setup Linux kernel Image entry point */
        if (!argc) {
-               ld = load_addr;
+               ld = image_load_addr;
                debug("*  kernel: default image load address = 0x%08lx\n",
-                               load_addr);
+                               image_load_addr);
        } else {
                ld = simple_strtoul(argv[0], NULL, 16);
                debug("*  kernel: cmdline image address = 0x%08lx\n", ld);
        }
 
+       temp = map_sysmem(ld, 0);
+       ctype = image_decomp_type(temp, 2);
+       if (ctype > 0) {
+               dest = env_get_ulong("kernel_comp_addr_r", 16, 0);
+               comp_len = env_get_ulong("kernel_comp_size", 16, 0);
+               if (!dest || !comp_len) {
+                       puts("kernel_comp_addr_r or kernel_comp_size is not provided!\n");
+                       return -EINVAL;
+               }
+               if (dest < gd->ram_base || dest > gd->ram_top) {
+                       puts("kernel_comp_addr_r is outside of DRAM range!\n");
+                       return -EINVAL;
+               }
+
+               debug("kernel image compression type %d size = 0x%08lx address = 0x%08lx\n",
+                       ctype, comp_len, (ulong)dest);
+               decomp_len = comp_len * 10;
+               ret = image_decomp(ctype, 0, ld, IH_TYPE_KERNEL,
+                                (void *)dest, (void *)ld, comp_len,
+                                decomp_len, &dest_end);
+               if (ret)
+                       return ret;
+               /* dest_end contains the uncompressed Image size */
+               memmove((void *) ld, (void *)dest, dest_end);
+       }
+       unmap_sysmem((void *)ld);
+
        ret = booti_setup(ld, &relocated_addr, &image_size, false);
        if (ret != 0)
                return 1;
@@ -48,6 +83,9 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
        }
 
        images->ep = relocated_addr;
+       images->os.start = relocated_addr;
+       images->os.end = relocated_addr + image_size;
+
        lmb_reserve(&images->lmb, images->ep, le32_to_cpu(image_size));
 
        /*
@@ -60,7 +98,7 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
-int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int ret;
 
@@ -96,10 +134,14 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_SYS_LONGHELP
 static char booti_help_text[] =
        "[addr [initrd[:size]] [fdt]]\n"
-       "    - boot Linux 'Image' stored at 'addr'\n"
+       "    - boot Linux flat or compressed 'Image' stored at 'addr'\n"
        "\tThe argument 'initrd' is optional and specifies the address\n"
        "\tof an initrd in memory. The optional parameter ':size' allows\n"
        "\tspecifying the size of a RAW initrd.\n"
+       "\tCurrently only booting from gz, bz2, lzma and lz4 compression\n"
+       "\ttypes are supported. In order to boot from any of these compressed\n"
+       "\timages, user have to set kernel_comp_addr_r and kernel_comp_size enviornment\n"
+       "\tvariables beforehand.\n"
 #if defined(CONFIG_OF_LIBFDT)
        "\tSince booting a Linux kernel requires a flat device-tree, a\n"
        "\tthird argument providing the address of the device-tree blob\n"