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 with /home/stefan/git/u-boot/acadia
[platform/kernel/u-boot.git]
/
common
/
hush.c
diff --git
a/common/hush.c
b/common/hush.c
index
bb5041a
..
feb5627
100644
(file)
--- a/
common/hush.c
+++ b/
common/hush.c
@@
-138,6
+138,8
@@
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /
#endif
#ifdef __U_BOOT__
+DECLARE_GLOBAL_DATA_PTR;
+
#define EXIT_SUCCESS 0
#define EOF -1
#define syntax() syntax_err()
@@
-3272,7
+3274,6
@@
int parse_file_outer(void)
#ifdef __U_BOOT__
static void u_boot_hush_reloc(void)
{
- DECLARE_GLOBAL_DATA_PTR;
unsigned long addr;
struct reserved_combo *r;