Merge branch 'next' of git://git.denx.de/u-boot-coldfire

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

diff --git a/include/image.h b/include/image.h
index 4609200b854b263bd6336f297c71e830bb7732c2..beb3a16cd1f18e966aaa01750ae6fdbc8cb56d85 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -33,8 +33,9 @@
 #ifndef __IMAGE_H__
 #define __IMAGE_H__
 
-#if USE_HOSTCC
-#include <endian.h>
+#include "compiler.h"
+
+#ifdef USE_HOSTCC
 
 /* new uImage format support enabled on host */
 #define CONFIG_FIT             1
@@ -44,9 +45,7 @@
 #else
 
 #include <lmb.h>
-#include <linux/string.h>
 #include <asm/u-boot.h>
-#include <asm/byteorder.h>
 
 #endif /* USE_HOSTCC */
 
@@ -282,8 +281,8 @@ typedef struct bootm_headers {
 #define CHUNKSZ_SHA1 (64 * 1024)
 #endif
 
-#define uimage_to_cpu(x)               ntohl(x)
-#define cpu_to_uimage(x)               htonl(x)
+#define uimage_to_cpu(x)               be32_to_cpu(x)
+#define cpu_to_uimage(x)               cpu_to_be32(x)
 
 const char *genimg_get_os_name (uint8_t os);
 const char *genimg_get_arch_name (uint8_t arch);
@@ -338,23 +337,23 @@ static inline uint32_t image_get_header_size (void)
        { \
                return uimage_to_cpu (hdr->ih_##f); \
        }
-image_get_hdr_l (magic);
-image_get_hdr_l (hcrc);
-image_get_hdr_l (time);
-image_get_hdr_l (size);
-image_get_hdr_l (load);
-image_get_hdr_l (ep);
-image_get_hdr_l (dcrc);
+image_get_hdr_l (magic);       /* image_get_magic */
+image_get_hdr_l (hcrc);                /* image_get_hcrc */
+image_get_hdr_l (time);                /* image_get_time */
+image_get_hdr_l (size);                /* image_get_size */
+image_get_hdr_l (load);                /* image_get_load */
+image_get_hdr_l (ep);          /* image_get_ep */
+image_get_hdr_l (dcrc);                /* image_get_dcrc */
 
 #define image_get_hdr_b(f) \
        static inline uint8_t image_get_##f(image_header_t *hdr) \
        { \
                return hdr->ih_##f; \
        }
-image_get_hdr_b (os);
-image_get_hdr_b (arch);
-image_get_hdr_b (type);
-image_get_hdr_b (comp);
+image_get_hdr_b (os);          /* image_get_os */
+image_get_hdr_b (arch);                /* image_get_arch */
+image_get_hdr_b (type);                /* image_get_type */
+image_get_hdr_b (comp);                /* image_get_comp */
 
 static inline char *image_get_name (image_header_t *hdr)
 {
@@ -396,23 +395,23 @@ static inline ulong image_get_image_end (image_header_t *hdr)
        { \
                hdr->ih_##f = cpu_to_uimage (val); \
        }
-image_set_hdr_l (magic);
-image_set_hdr_l (hcrc);
-image_set_hdr_l (time);
-image_set_hdr_l (size);
-image_set_hdr_l (load);
-image_set_hdr_l (ep);
-image_set_hdr_l (dcrc);
+image_set_hdr_l (magic);       /* image_set_magic */
+image_set_hdr_l (hcrc);                /* image_set_hcrc */
+image_set_hdr_l (time);                /* image_set_time */
+image_set_hdr_l (size);                /* image_set_size */
+image_set_hdr_l (load);                /* image_set_load */
+image_set_hdr_l (ep);          /* image_set_ep */
+image_set_hdr_l (dcrc);                /* image_set_dcrc */
 
 #define image_set_hdr_b(f) \
        static inline void image_set_##f(image_header_t *hdr, uint8_t val) \
        { \
                hdr->ih_##f = val; \
        }
-image_set_hdr_b (os);
-image_set_hdr_b (arch);
-image_set_hdr_b (type);
-image_set_hdr_b (comp);
+image_set_hdr_b (os);          /* image_set_os */
+image_set_hdr_b (arch);                /* image_set_arch */
+image_set_hdr_b (type);                /* image_set_type */
+image_set_hdr_b (comp);                /* image_set_comp */
 
 static inline void image_set_name (image_header_t *hdr, const char *name)
 {