[new uImage] Rename and move print_image_hdr() routine

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

diff --git a/include/image.h b/include/image.h
index ecfce7215d21f9d6c39305ef33acff58a2683650..502d35a3ef2afc3958af4ac27c619c8a884519ba 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -342,6 +342,13 @@ const char* image_get_os_name (uint8_t os);
 const char* image_get_arch_name (uint8_t arch);
 const char* image_get_type_name (uint8_t type);
 const char* image_get_comp_name (uint8_t comp);
+void image_print_contents (image_header_t *hdr);
+
+#define IMAGE_FORMAT_INVALID   0x00
+#define IMAGE_FORMAT_LEGACY    0x01
+#define IMAGE_FORMAT_FIT       0x02
+int gen_image_get_format (void *img_addr);
+ulong gen_get_image (ulong img_addr);
 
 image_header_t* image_get_ramdisk (cmd_tbl_t *cmdtp, int flag,
                int argc, char *argv[],
@@ -361,6 +368,16 @@ ulong get_boot_cmdline (ulong alloc_current, ulong *cmd_start, ulong *cmd_end);
 ulong get_boot_kbd (ulong alloc_current, bd_t **kbd);
 #endif /* CONFIG_PPC || CONFIG_M68K */
 
+#if defined(CONFIG_FIT)
+/*
+ * New uImage format
+ */
+inline int fit_parse_conf (const char *spec, ulong addr_curr,
+               ulong *addr, const char **conf_name);
+inline int fit_parse_subimage (const char *spec, ulong addr_curr,
+               ulong *addr, const char **image_name);
+#endif /* CONFIG_FIT */
+
 #endif /* USE_HOSTCC */
 
 #endif /* __IMAGE_H__ */