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

[karo-tx-uboot.git] / include / image.h

diff --git a/include/image.h b/include/image.h
index 04b62d154fe2555749c8c13680320d7bd6857458..541cac97fe1e13f18cb7e6f7cc2be9feb8ee2e84 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -46,16 +46,16 @@
 
 #include <lmb.h>
 #include <asm/u-boot.h>
+#include <command.h>
 
 #endif /* USE_HOSTCC */
 
-#include <command.h>
-
 #if defined(CONFIG_FIT)
 #include <fdt.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #define CONFIG_MD5             /* FIT images need MD5 support */
+#define CONFIG_SHA1            /* and SHA1 */
 #endif
 
 /*
@@ -156,6 +156,7 @@
 #define IH_TYPE_FILESYSTEM     7       /* Filesystem Image (any type)  */
 #define IH_TYPE_FLATDT         8       /* Binary Flat Device Tree Blob */
 #define IH_TYPE_KWBIMAGE       9       /* Kirkwood Boot Image          */
+#define IH_TYPE_IMXIMAGE       10      /* Freescale IMXBoot Image      */
 
 /*
  * Compression Types
@@ -164,6 +165,7 @@
 #define IH_COMP_GZIP           1       /* gzip  Compression Used       */
 #define IH_COMP_BZIP2          2       /* bzip2 Compression Used       */
 #define IH_COMP_LZMA           3       /* lzma  Compression Used       */
+#define IH_COMP_LZO            4       /* lzo   Compression Used       */
 
 #define IH_MAGIC       0x27051956      /* Image Magic Number           */
 #define IH_NMLEN               32      /* Image Name Length            */
@@ -254,7 +256,7 @@ typedef struct bootm_headers {
 #define        BOOTM_STATE_OS_GO       (0x00000080)
        int             state;
 
-#ifndef USE_HOSTCC
+#ifdef CONFIG_LMB
        struct lmb      lmb;            /* for memory mgmt */
 #endif
 } bootm_headers_t;