Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 07f6c6b..5d5dd33 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -30,7 +30,7 @@
 #include <command.h>
 #include <image.h>
 #include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <environment.h>
 #include <lmb.h>
@@ -52,9 +52,8 @@
 #endif
 
 #ifdef CONFIG_LZMA
-#define _7ZIP_BYTE_DEFINED /* Byte already defined by zlib */
 #include <lzma/LzmaTypes.h>
-#include <lzma/LzmaDecode.h>
+#include <lzma/LzmaDec.h>
 #include <lzma/LzmaTools.h>
 #endif /* CONFIG_LZMA */
 
@@ -340,8 +339,10 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
                } else {
                        printf ("   Loading %s ... ", type_name);
 
-                       memmove_wd ((void *)load,
-                                  (void *)image_start, image_len, CHUNKSZ);
+                       if (load != image_start) {
+                               memmove_wd ((void *)load,
+                                               (void *)image_start, image_len, CHUNKSZ);
+                       }
                }
                *load_end = load + image_len;
                puts("OK\n");
@@ -388,7 +389,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
                int ret = lzmaBuffToBuffDecompress(
                        (unsigned char *)load, &unc_len,
                        (unsigned char *)image_start, image_len);
-               if (ret != LZMA_RESULT_OK) {
+               if (ret != SZ_OK) {
                        printf ("LZMA: uncompress or overwrite error %d "
                                "- must RESET board to recover\n", ret);
                        show_boot_progress (-6);
@@ -946,7 +947,7 @@ U_BOOT_CMD(
        "\tbdt     - OS specific bd_t processing\n"
        "\tcmdline - OS specific command line processing/setup\n"
        "\tprep    - OS specific prep before relocation or go\n"
-       "\tgo      - start OS\n"
+       "\tgo      - start OS"
 );
 
 /*******************************************************************/
@@ -971,14 +972,14 @@ int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        boot,   1,      1,      do_bootd,
        "boot default, i.e., run 'bootcmd'",
-       NULL
+       ""
 );
 
 /* keep old command name "bootd" for backward compatibility */
 U_BOOT_CMD(
        bootd, 1,       1,      do_bootd,
        "boot default, i.e., run 'bootcmd'",
-       NULL
+       ""
 );
 
 #endif
@@ -1066,7 +1067,7 @@ U_BOOT_CMD(
        "addr [addr ...]\n"
        "    - print header information for application image starting at\n"
        "      address 'addr' in memory; this includes verification of the\n"
-       "      image contents (magic number, header and payload checksums)\n"
+       "      image contents (magic number, header and payload checksums)"
 );
 #endif
 
@@ -1133,7 +1134,7 @@ U_BOOT_CMD(
        "list all images found in flash",
        "\n"
        "    - Prints information about all images found at sector\n"
-       "      boundaries in flash.\n"
+       "      boundaries in flash."
 );
 #endif