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 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
include
/
image.h
diff --git
a/include/image.h
b/include/image.h
index
664e51e
..
4b9c582
100644
(file)
--- a/
include/image.h
+++ b/
include/image.h
@@
-220,7
+220,6
@@
typedef struct bootm_headers {
#endif
int verify; /* getenv("verify")[0] != 'n' */
#endif
int verify; /* getenv("verify")[0] != 'n' */
- int autostart; /* getenv("autostart")[0] != 'n' */
struct lmb *lmb; /* for memory mgmt */
} bootm_headers_t;
struct lmb *lmb; /* for memory mgmt */
} bootm_headers_t;
@@
-379,7
+378,7
@@
int image_check_dcrc (image_header_t *hdr);
#ifndef USE_HOSTCC
int getenv_yesno (char *var);
ulong getenv_bootm_low(void);
#ifndef USE_HOSTCC
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
void memmove_wd (void *to, void *from, size_t len, ulong chunksz);
#endif