Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[platform/kernel/u-boot.git] / include / image.h

diff --git a/include/image.h b/include/image.h
index 4076484..4b9c582 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -220,16 +220,29 @@ typedef struct bootm_headers {
 #endif
 
        int             verify;         /* getenv("verify")[0] != 'n' */
-       int             autostart;      /* getenv("autostart")[0] != 'n' */
        struct lmb      *lmb;           /* for memory mgmt */
 } bootm_headers_t;
 
 /*
  * Some systems (for example LWMON) have very short watchdog periods;
  * we must make sure to split long operations like memmove() or
- * crc32() into reasonable chunks.
+ * checksum calculations into reasonable chunks.
  */
+#ifndef CHUNKSZ
 #define CHUNKSZ (64 * 1024)
+#endif
+
+#ifndef CHUNKSZ_CRC32
+#define CHUNKSZ_CRC32 (64 * 1024)
+#endif
+
+#ifndef CHUNKSZ_MD5
+#define CHUNKSZ_MD5 (64 * 1024)
+#endif
+
+#ifndef CHUNKSZ_SHA1
+#define CHUNKSZ_SHA1 (64 * 1024)
+#endif
 
 #define uimage_to_cpu(x)               ntohl(x)
 #define cpu_to_uimage(x)               htonl(x)
@@ -363,10 +376,9 @@ static inline void image_set_name (image_header_t *hdr, const char *name)
 int image_check_hcrc (image_header_t *hdr);
 int image_check_dcrc (image_header_t *hdr);
 #ifndef USE_HOSTCC
-int image_check_dcrc_wd (image_header_t *hdr, ulong chunksize);
 int getenv_yesno (char *var);
 ulong getenv_bootm_low(void);
-ulong getenv_bootm_size(void);
+phys_size_t getenv_bootm_size(void);
 void memmove_wd (void *to, void *from, size_t len, ulong chunksz);
 #endif