projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] mips_config.mk: Misc fixes
[oweals/u-boot.git]
/
common
/
hush.c
diff --git
a/common/hush.c
b/common/hush.c
index bb5041a08d872d93b04077fab9edadbd02fca12c..b43f6185acf5360d335a063fd0405fd82b5ecce9 100644
(file)
--- a/
common/hush.c
+++ b/
common/hush.c
@@
-1,4
+1,3
@@
-/* vi: set sw=4 ts=4: */
/*
* sh.c -- a prototype Bourne shell grammar parser
* Intended to follow the original Thompson and Ritchie
/*
* sh.c -- a prototype Bourne shell grammar parser
* Intended to follow the original Thompson and Ritchie
@@
-138,6
+137,8
@@
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /
#endif
#ifdef __U_BOOT__
#endif
#ifdef __U_BOOT__
+DECLARE_GLOBAL_DATA_PTR;
+
#define EXIT_SUCCESS 0
#define EOF -1
#define syntax() syntax_err()
#define EXIT_SUCCESS 0
#define EOF -1
#define syntax() syntax_err()
@@
-1680,7
+1681,7
@@
static int run_pipe_real(struct pipe *pi)
return -1; /* give up after bad command */
} else {
int rcode;
return -1; /* give up after bad command */
} else {
int rcode;
-#if
(CONFIG_COMMANDS & CF
G_CMD_BOOTD)
+#if
defined(CONFI
G_CMD_BOOTD)
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
/* avoid "bootd" recursion */
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
/* avoid "bootd" recursion */
@@
-1692,7
+1693,7
@@
static int run_pipe_real(struct pipe *pi)
else
flag |= CMD_FLAG_BOOTD;
}
else
flag |= CMD_FLAG_BOOTD;
}
-#endif
/* CFG_CMD_BOOTD */
+#endif
/* found - check max args */
if ((child->argc - i) > cmdtp->maxargs) {
printf ("Usage:\n%s\n", cmdtp->usage);
/* found - check max args */
if ((child->argc - i) > cmdtp->maxargs) {
printf ("Usage:\n%s\n", cmdtp->usage);
@@
-3272,7
+3273,6
@@
int parse_file_outer(void)
#ifdef __U_BOOT__
static void u_boot_hush_reloc(void)
{
#ifdef __U_BOOT__
static void u_boot_hush_reloc(void)
{
- DECLARE_GLOBAL_DATA_PTR;
unsigned long addr;
struct reserved_combo *r;
unsigned long addr;
struct reserved_combo *r;