diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:33 +0200 |
| commit | a5bf47e33a17e9131dc7bcdbd1b449292b00a81d (patch) | |
| tree | f0430efc3b29061ef9416488d2b59f569cc27c62 /common/hush.c | |
| parent | a9ff695f4773d4155558038987fbb73a32043380 (diff) | |
| download | barebox-a5bf47e33a17e9131dc7bcdbd1b449292b00a81d.tar.gz barebox-a5bf47e33a17e9131dc7bcdbd1b449292b00a81d.tar.xz | |
svn_rev_207
move several config options to kconfig
Diffstat (limited to 'common/hush.c')
| -rw-r--r-- | common/hush.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/hush.c b/common/hush.c index f7550b9cdf..c378f6def7 100644 --- a/common/hush.c +++ b/common/hush.c @@ -97,7 +97,7 @@ /*cmd_boot.c*/ extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* do_bootd */ #endif -#ifdef CFG_HUSH_PARSER +#ifdef CONFIG_HUSH_PARSER #ifndef __U_BOOT__ #include <ctype.h> /* isalpha, isdigit */ #include <unistd.h> /* getpid */ @@ -1012,9 +1012,9 @@ static void get_user_input(struct in_str *i) fflush(stdout); i->p = the_command; #else - extern char console_buffer[CFG_CBSIZE]; + extern char console_buffer[CONFIG_CBSIZE]; int n; - static char the_command[CFG_CBSIZE]; + static char the_command[CONFIG_CBSIZE]; #ifdef CONFIG_BOOT_RETRY_TIME # ifdef CONFIG_RESET_TO_RETRY @@ -1026,9 +1026,9 @@ static void get_user_input(struct in_str *i) #endif i->__promptme = 1; if (i->promptmode == 1) { - n = readline(CFG_PROMPT); + n = readline(CONFIG_PROMPT); } else { - n = readline(CFG_PROMPT_HUSH_PS2); + n = readline(CONFIG_PROMPT_HUSH_PS2); } #ifdef CONFIG_BOOT_RETRY_TIME if (n == -2) { @@ -1068,7 +1068,7 @@ static void get_user_input(struct in_str *i) else { if (console_buffer[0] != '\n') { if (strlen(the_command) + strlen(console_buffer) - < CFG_CBSIZE) { + < CONFIG_CBSIZE) { n = strlen(the_command); the_command[n-1] = ' '; strcpy(&the_command[n],console_buffer); @@ -3545,5 +3545,5 @@ static char * make_string(char ** inp) return str; } -#endif /* CFG_HUSH_PARSER */ +#endif /* CONFIG_HUSH_PARSER */ /****************************************************************************/ |