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

[karo-tx-uboot.git] / tools / mkimage.h

diff --git a/tools/mkimage.h b/tools/mkimage.h
index 120970fc68fed9123b4a630fb6149abf4a90b836..e07a6157ebca0052d66b7713686e46df8d7ea655 100644 (file)
--- a/tools/mkimage.h
+++ b/tools/mkimage.h
@@ -42,6 +42,8 @@
 #define debug(fmt,args...)
 #endif /* MKIMAGE_DEBUG */
 
+#define ARRAY_SIZE(x)          (sizeof(x) / sizeof((x)[0]))
+
 #define MKIMAGE_TMPFILE_SUFFIX         ".tmp"
 #define MKIMAGE_MAX_TMPFILE_LEN                256
 #define MKIMAGE_DEFAULT_DTC_OPTIONS    "-I dts -O dtb -p 500"
@@ -60,6 +62,7 @@ struct mkimage_params {
        int lflag;
        int vflag;
        int xflag;
+       int skipcpy;
        int os;
        int arch;
        int type;
@@ -68,6 +71,7 @@ struct mkimage_params {
        unsigned int addr;
        unsigned int ep;
        char *imagename;
+       char *imagename2;
        char *datafile;
        char *imagefile;
        char *cmdname;
@@ -104,7 +108,7 @@ struct image_type_params {
         */
        int (*verify_header) (unsigned char *, int, struct mkimage_params *);
        /* Prints image information abstracting from image header */
-       void (*print_header) (void *);
+       void (*print_header) (const void *);
        /*
         * The header or image contents need to be set as per image type to
         * be generated using this callback function.
@@ -122,6 +126,13 @@ struct image_type_params {
        int (*check_image_type) (uint8_t);
        /* This callback function will be executed if fflag is defined */
        int (*fflag_handle) (struct mkimage_params *);
+       /*
+        * This callback function will be executed for variable size record
+        * It is expected to build this header in memory and return its length
+        * and a pointer to it
+        */
+       int (*vrec_header) (struct mkimage_params *,
+               struct image_type_params *);
        /* pointer to the next registered entry in linked list */
        struct image_type_params *next;
 };
@@ -139,7 +150,14 @@ void mkimage_register (struct image_type_params *tparams);
  *
  * Supported image types init functions
  */
+void pbl_load_uboot(int fd, struct mkimage_params *mparams);
+void init_pbl_image_type(void);
+void init_ais_image_type(void);
+void init_kwb_image_type (void);
+void init_imx_image_type (void);
 void init_default_image_type (void);
 void init_fit_image_type (void);
+void init_ubl_image_type(void);
+void init_omap_image_type(void);
 
 #endif /* _MKIIMAGE_H_ */