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
cmd_date: constify
[platform/kernel/u-boot.git]
/
common
/
hush.c
diff --git
a/common/hush.c
b/common/hush.c
index
06c5ff8
..
8021a68
100644
(file)
--- a/
common/hush.c
+++ b/
common/hush.c
@@
-93,8
+93,6
@@
#include <common.h> /* readline */
#include <hush.h>
#include <command.h> /* find_cmd */
#include <common.h> /* readline */
#include <hush.h>
#include <command.h> /* find_cmd */
-/*cmd_boot.c*/
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* do_bootd */
#endif
#ifndef __U_BOOT__
#include <ctype.h> /* isalpha, isdigit */
#endif
#ifndef __U_BOOT__
#include <ctype.h> /* isalpha, isdigit */
@@
-1018,14
+1016,12
@@
static void get_user_input(struct in_str *i)
fflush(stdout);
i->p = the_command;
#else
fflush(stdout);
i->p = the_command;
#else
- extern char console_buffer[
CONFIG_SYS_CBSIZE
];
+ extern char console_buffer[];
int n;
static char the_command[CONFIG_SYS_CBSIZE];
#ifdef CONFIG_BOOT_RETRY_TIME
int n;
static char the_command[CONFIG_SYS_CBSIZE];
#ifdef CONFIG_BOOT_RETRY_TIME
-# ifdef CONFIG_RESET_TO_RETRY
- extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-# else
+# ifndef CONFIG_RESET_TO_RETRY
# error "This currently only works with CONFIG_RESET_TO_RETRY enabled"
# endif
reset_cmd_timeout();
# error "This currently only works with CONFIG_RESET_TO_RETRY enabled"
# endif
reset_cmd_timeout();
@@
-1681,8
+1677,6
@@
static int run_pipe_real(struct pipe *pi)
} else {
int rcode;
#if defined(CONFIG_CMD_BOOTD)
} else {
int rcode;
#if defined(CONFIG_CMD_BOOTD)
- extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
if (flag & CMD_FLAG_BOOTD) {
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
if (flag & CMD_FLAG_BOOTD) {
@@
-1694,10
+1688,8
@@
static int run_pipe_real(struct pipe *pi)
}
#endif
/* found - check max args */
}
#endif
/* found - check max args */
- if ((child->argc - i) > cmdtp->maxargs) {
- cmd_usage(cmdtp);
- return -1;
- }
+ if ((child->argc - i) > cmdtp->maxargs)
+ return cmd_usage(cmdtp);
#endif
child->argv+=i; /* XXX horrible hack */
#ifndef __U_BOOT__
#endif
child->argv+=i; /* XXX horrible hack */
#ifndef __U_BOOT__
@@
-3270,7
+3262,7
@@
int parse_file_outer(void)
}
#ifdef __U_BOOT__
}
#ifdef __U_BOOT__
-#if
ndef CONFIG_RELOC_FIXUP_WORKS
+#if
def CONFIG_NEEDS_MANUAL_RELOC
static void u_boot_hush_reloc(void)
{
unsigned long addr;
static void u_boot_hush_reloc(void)
{
unsigned long addr;
@@
-3292,7
+3284,7
@@
int u_boot_hush_start(void)
top_vars->next = 0;
top_vars->flg_export = 0;
top_vars->flg_read_only = 1;
top_vars->next = 0;
top_vars->flg_export = 0;
top_vars->flg_read_only = 1;
-#if
ndef CONFIG_RELOC_FIXUP_WORKS
+#if
def CONFIG_NEEDS_MANUAL_RELOC
u_boot_hush_reloc();
#endif
}
u_boot_hush_reloc();
#endif
}
@@
-3351,7
+3343,7
@@
static void setup_job_control(void)
tcsetpgrp(shell_terminal, shell_pgrp);
}
tcsetpgrp(shell_terminal, shell_pgrp);
}
-int hush_main(int argc, char **argv)
+int hush_main(int argc, char *
const
*argv)
{
int opt;
FILE *input;
{
int opt;
FILE *input;
@@
-3588,7
+3580,7
@@
static char * make_string(char ** inp)
}
#ifdef __U_BOOT__
}
#ifdef __U_BOOT__
-int do_showvar (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_showvar (cmd_tbl_t *cmdtp, int flag, int argc, char *
const
argv[])
{
int i, k;
int rcode = 0;
{
int i, k;
int rcode = 0;