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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
common
/
hush.c
diff --git
a/common/hush.c
b/common/hush.c
index
67bed39
..
9aef6e4
100644
(file)
--- a/
common/hush.c
+++ b/
common/hush.c
@@
-96,7
+96,7
@@
/*cmd_boot.c*/
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* do_bootd */
#endif
/*cmd_boot.c*/
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* do_bootd */
#endif
-#ifdef C
FG
_HUSH_PARSER
+#ifdef C
ONFIG_SYS
_HUSH_PARSER
#ifndef __U_BOOT__
#include <ctype.h> /* isalpha, isdigit */
#include <unistd.h> /* getpid */
#ifndef __U_BOOT__
#include <ctype.h> /* isalpha, isdigit */
#include <unistd.h> /* getpid */
@@
-1019,9
+1019,9
@@
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[C
FG
_CBSIZE];
+ extern char console_buffer[C
ONFIG_SYS
_CBSIZE];
int n;
int n;
- static char the_command[C
FG
_CBSIZE];
+ static char the_command[C
ONFIG_SYS
_CBSIZE];
#ifdef CONFIG_BOOT_RETRY_TIME
# ifdef CONFIG_RESET_TO_RETRY
#ifdef CONFIG_BOOT_RETRY_TIME
# ifdef CONFIG_RESET_TO_RETRY
@@
-1033,9
+1033,9
@@
static void get_user_input(struct in_str *i)
#endif
i->__promptme = 1;
if (i->promptmode == 1) {
#endif
i->__promptme = 1;
if (i->promptmode == 1) {
- n = readline(C
FG
_PROMPT);
+ n = readline(C
ONFIG_SYS
_PROMPT);
} else {
} else {
- n = readline(C
FG
_PROMPT_HUSH_PS2);
+ n = readline(C
ONFIG_SYS
_PROMPT_HUSH_PS2);
}
#ifdef CONFIG_BOOT_RETRY_TIME
if (n == -2) {
}
#ifdef CONFIG_BOOT_RETRY_TIME
if (n == -2) {
@@
-1075,7
+1075,7
@@
static void get_user_input(struct in_str *i)
else {
if (console_buffer[0] != '\n') {
if (strlen(the_command) + strlen(console_buffer)
else {
if (console_buffer[0] != '\n') {
if (strlen(the_command) + strlen(console_buffer)
- < C
FG
_CBSIZE) {
+ < C
ONFIG_SYS
_CBSIZE) {
n = strlen(the_command);
the_command[n-1] = ' ';
strcpy(&the_command[n],console_buffer);
n = strlen(the_command);
the_command[n-1] = ' ';
strcpy(&the_command[n],console_buffer);
@@
-3624,7
+3624,7
@@
int do_showvar (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
U_BOOT_CMD(
}
U_BOOT_CMD(
- showvar, C
FG_MAXARGS, 1,
do_showvar,
+ showvar, C
ONFIG_SYS_MAXARGS, 1,
do_showvar,
"showvar- print local hushshell variables\n",
"\n - print values of all hushshell variables\n"
"showvar name ...\n"
"showvar- print local hushshell variables\n",
"\n - print values of all hushshell variables\n"
"showvar name ...\n"
@@
-3632,5
+3632,5
@@
U_BOOT_CMD(
);
#endif
);
#endif
-#endif /* C
FG
_HUSH_PARSER */
+#endif /* C
ONFIG_SYS
_HUSH_PARSER */
/****************************************************************************/
/****************************************************************************/