projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
include
/
image.h
diff --git
a/include/image.h
b/include/image.h
index
74a1240
..
beb3a16
100644
(file)
--- a/
include/image.h
+++ b/
include/image.h
@@
-33,8
+33,9
@@
#ifndef __IMAGE_H__
#define __IMAGE_H__
#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
/* new uImage format support enabled on host */
#define CONFIG_FIT 1
@@
-44,9
+45,7
@@
#else
#include <lmb.h>
#else
#include <lmb.h>
-#include <linux/string.h>
#include <asm/u-boot.h>
#include <asm/u-boot.h>
-#include <asm/byteorder.h>
#endif /* USE_HOSTCC */
#endif /* USE_HOSTCC */
@@
-282,8
+281,8
@@
typedef struct bootm_headers {
#define CHUNKSZ_SHA1 (64 * 1024)
#endif
#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);
const char *genimg_get_os_name (uint8_t os);
const char *genimg_get_arch_name (uint8_t arch);