Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / tools / kwbimage.c

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index ee067cbd81deee9b5747551590a890d1d7fe7826..f327b079b2180856dce8294cccf700c2ba529b25 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -33,7 +33,7 @@
  * Supported commands for configuration file
  */
 static table_entry_t kwbimage_cmds[] = {
-       {CMD_BOOT_FROM,         "BOOT_FROM",            "boot comand",  },
+       {CMD_BOOT_FROM,         "BOOT_FROM",            "boot command", },
        {CMD_NAND_ECC_MODE,     "NAND_ECC_MODE",        "NAND mode",    },
        {CMD_NAND_PAGE_SIZE,    "NAND_PAGE_SIZE",       "NAND size",    },
        {CMD_SATA_PIO_MODE,     "SATA_PIO_MODE",        "SATA mode",    },
@@ -131,7 +131,7 @@ static uint32_t kwbimage_checksum32 (uint32_t *start, uint32_t len, uint32_t csu
                return 0;
 
        if (len % sizeof(uint32_t)) {
-               printf ("Error:%s[%d] - lenght is not in multiple of %ld\n",
+               printf ("Error:%s[%d] - length is not in multiple of %zu\n",
                        __FUNCTION__, len, sizeof(uint32_t));
                return 0;
        }
@@ -356,7 +356,7 @@ static int kwbimage_verify_header (unsigned char *ptr, int image_size,
 
        calc_exthdrcsum = kwbimage_checksum8 ((void *)exthdr,
                        sizeof(extbhr_t) - sizeof(uint8_t), 0);
-       if (calc_hdrcsum != mhdr->checkSum)
+       if (calc_exthdrcsum != exthdr->checkSum)
                return -FDT_ERR_BADSTRUCTURE; /* exthdr csum not matched */
 
        return 0;