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
/
main.c
diff --git
a/common/main.c
b/common/main.c
index cc4b50f615ab070c806773cfa57661f1dd889bbe..046da6f23ca488d02f3fb900c48fc2b96caafb9e 100644
(file)
--- a/
common/main.c
+++ b/
common/main.c
@@
-40,10
+40,16
@@
#include <post.h>
#include <post.h>
-#if
def CONFIG_SILENT_CONSOLE
+#if
defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
DECLARE_GLOBAL_DATA_PTR;
#endif
DECLARE_GLOBAL_DATA_PTR;
#endif
+/*
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+void inline __show_boot_progress (int val) {}
+void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+
#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
#endif
#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
#endif
@@
-53,7
+59,6
@@
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
#define MAX_DELAY_STOP_STR 32
#define MAX_DELAY_STOP_STR 32
-static int parse_line (char *, char *[]);
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
static int abortboot(int);
#endif
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
static int abortboot(int);
#endif
@@
-62,11
+67,9
@@
static int abortboot(int);
char console_buffer[CFG_CBSIZE]; /* console I/O buffer */
char console_buffer[CFG_CBSIZE]; /* console I/O buffer */
-#ifndef CONFIG_CMDLINE_EDITING
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
static char erase_seq[] = "\b \b"; /* erase sequence */
static char tab_seq[] = " "; /* used to expand TABs */
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
static char erase_seq[] = "\b \b"; /* erase sequence */
static char tab_seq[] = " "; /* used to expand TABs */
-#endif /* CONFIG_CMDLINE_EDITING */
#ifdef CONFIG_BOOT_RETRY_TIME
static uint64_t endtime = 0; /* must be set, default is instant timeout */
#ifdef CONFIG_BOOT_RETRY_TIME
static uint64_t endtime = 0; /* must be set, default is instant timeout */
@@
-112,16
+115,8
@@
static __inline__ int abortboot(int bootdelay)
u_int presskey_max = 0;
u_int i;
u_int presskey_max = 0;
u_int i;
-#ifdef CONFIG_SILENT_CONSOLE
- if (gd->flags & GD_FLG_SILENT) {
- /* Restore serial console */
- console_assign (stdout, "serial");
- console_assign (stderr, "serial");
- }
-#endif
-
# ifdef CONFIG_AUTOBOOT_PROMPT
# ifdef CONFIG_AUTOBOOT_PROMPT
- printf
(CONFIG_AUTOBOOT_PROMPT, bootdelay);
+ printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
# endif
# ifdef CONFIG_AUTOBOOT_DELAY_STR
# endif
# ifdef CONFIG_AUTOBOOT_DELAY_STR
@@
-195,18
+190,12
@@
static __inline__ int abortboot(int bootdelay)
}
# if DEBUG_BOOTKEYS
if (!abort)
}
# if DEBUG_BOOTKEYS
if (!abort)
- puts
("key timeout\n");
+ puts("key timeout\n");
# endif
#ifdef CONFIG_SILENT_CONSOLE
# endif
#ifdef CONFIG_SILENT_CONSOLE
- if (abort) {
- /* permanently enable normal console output */
- gd->flags &= ~(GD_FLG_SILENT);
- } else if (gd->flags & GD_FLG_SILENT) {
- /* Restore silent console */
- console_assign (stdout, "nulldev");
- console_assign (stderr, "nulldev");
- }
+ if (abort)
+ gd->flags &= ~GD_FLG_SILENT;
#endif
return abort;
#endif
return abort;
@@
-222,14
+211,6
@@
static __inline__ int abortboot(int bootdelay)
{
int abort = 0;
{
int abort = 0;
-#ifdef CONFIG_SILENT_CONSOLE
- if (gd->flags & GD_FLG_SILENT) {
- /* Restore serial console */
- console_assign (stdout, "serial");
- console_assign (stderr, "serial");
- }
-#endif
-
#ifdef CONFIG_MENUPROMPT
printf(CONFIG_MENUPROMPT, bootdelay);
#else
#ifdef CONFIG_MENUPROMPT
printf(CONFIG_MENUPROMPT, bootdelay);
#else
@@
-245,7
+226,7
@@
static __inline__ int abortboot(int bootdelay)
if (tstc()) { /* we got a key press */
(void) getc(); /* consume input */
puts ("\b\b\b 0");
if (tstc()) { /* we got a key press */
(void) getc(); /* consume input */
puts ("\b\b\b 0");
- abort = 1; /* don't auto boot */
+ abort = 1; /* don't auto boot */
}
}
#endif
}
}
#endif
@@
-266,23
+247,17
@@
static __inline__ int abortboot(int bootdelay)
# endif
break;
}
# endif
break;
}
- udelay
(10000);
+ udelay(10000);
}
}
- printf
("\b\b\b%2d ", bootdelay);
+ printf("\b\b\b%2d ", bootdelay);
}
}
- putc
('\n');
+ putc('\n');
#ifdef CONFIG_SILENT_CONSOLE
#ifdef CONFIG_SILENT_CONSOLE
- if (abort) {
- /* permanently enable normal console output */
- gd->flags &= ~(GD_FLG_SILENT);
- } else if (gd->flags & GD_FLG_SILENT) {
- /* Restore silent console */
- console_assign (stdout, "nulldev");
- console_assign (stderr, "nulldev");
- }
+ if (abort)
+ gd->flags &= ~GD_FLG_SILENT;
#endif
return abort;
#endif
return abort;
@@
-392,6
+367,12
@@
void main_loop (void)
init_cmd_timeout ();
# endif /* CONFIG_BOOT_RETRY_TIME */
init_cmd_timeout ();
# endif /* CONFIG_BOOT_RETRY_TIME */
+#ifdef CONFIG_POST
+ if (gd->flags & GD_FLG_POSTFAIL) {
+ s = getenv("failbootcmd");
+ }
+ else
+#endif /* CONFIG_POST */
#ifdef CONFIG_BOOTCOUNT_LIMIT
if (bootlimit && (bootcount > bootlimit)) {
printf ("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n",
#ifdef CONFIG_BOOTCOUNT_LIMIT
if (bootlimit && (bootcount > bootlimit)) {
printf ("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n",
@@
-718,7
+699,7
@@
static void cread_add_str(char *str, int strsize, int insert, unsigned long *num
}
}
}
}
-static int cread_line(char *buf, unsigned int *len)
+static int cread_line(c
onst char *const prompt, c
har *buf, unsigned int *len)
{
unsigned long num = 0;
unsigned long eol_num = 0;
{
unsigned long num = 0;
unsigned long eol_num = 0;
@@
-732,6
+713,13
@@
static int cread_line(char *buf, unsigned int *len)
while (1) {
rlen = 1;
while (1) {
rlen = 1;
+#ifdef CONFIG_BOOT_RETRY_TIME
+ while (!tstc()) { /* while no incoming data */
+ if (retry_time >= 0 && get_ticks() > endtime)
+ return (-2); /* timed out */
+ }
+#endif
+
ichar = getcmd_getch();
if ((ichar == '\n') || (ichar == '\r')) {
ichar = getcmd_getch();
if ((ichar == '\n') || (ichar == '\r')) {
@@
-840,6
+828,7
@@
static int cread_line(char *buf, unsigned int *len)
insert = !insert;
break;
case CTL_CH('x'):
insert = !insert;
break;
case CTL_CH('x'):
+ case CTL_CH('u'):
BEGINNING_OF_LINE();
ERASE_TO_EOL();
break;
BEGINNING_OF_LINE();
ERASE_TO_EOL();
break;
@@
-889,6
+878,27
@@
static int cread_line(char *buf, unsigned int *len)
REFRESH_TO_EOL();
continue;
}
REFRESH_TO_EOL();
continue;
}
+#ifdef CONFIG_AUTO_COMPLETE
+ case '\t': {
+ int num2, col;
+
+ /* do not autocomplete when in the middle */
+ if (num < eol_num) {
+ getcmd_cbeep();
+ break;
+ }
+
+ buf[num] = '\0';
+ col = strlen(prompt) + eol_num;
+ num2 = num;
+ if (cmd_auto_complete(prompt, buf, &num2, &col)) {
+ col = num2 - num;
+ num += col;
+ eol_num += col;
+ }
+ break;
+ }
+#endif
default:
cread_add_char(ichar, insert, &num, &eol_num, buf, *len);
break;
default:
cread_add_char(ichar, insert, &num, &eol_num, buf, *len);
break;
@@
-918,23
+928,38
@@
static int cread_line(char *buf, unsigned int *len)
*/
int readline (const char *const prompt)
{
*/
int readline (const char *const prompt)
{
+ return readline_into_buffer(prompt, console_buffer);
+}
+
+
+int readline_into_buffer (const char *const prompt, char * buffer)
+{
+ char *p = buffer;
#ifdef CONFIG_CMDLINE_EDITING
#ifdef CONFIG_CMDLINE_EDITING
- char *p = console_buffer;
unsigned int len=MAX_CMDBUF_SIZE;
int rc;
static int initted = 0;
unsigned int len=MAX_CMDBUF_SIZE;
int rc;
static int initted = 0;
- if (!initted) {
- hist_init();
- initted = 1;
- }
+ /*
+ * History uses a global array which is not
+ * writable until after relocation to RAM.
+ * Revert to non-history version if still
+ * running from flash.
+ */
+ if (gd->flags & GD_FLG_RELOC) {
+ if (!initted) {
+ hist_init();
+ initted = 1;
+ }
+
+ puts (prompt);
- puts (prompt);
+ rc = cread_line(prompt, p, &len);
+ return rc < 0 ? rc : len;
- rc = cread_line(p, &len);
- return rc < 0 ? rc : len;
-#else
- char *p = console_buffer;
+ } else {
+#endif /* CONFIG_CMDLINE_EDITING */
+ char * p_buf = p;
int n = 0; /* buffer index */
int plen = 0; /* prompt length */
int col; /* output column cnt */
int n = 0; /* buffer index */
int plen = 0; /* prompt length */
int col; /* output column cnt */
@@
-972,13
+997,13
@@
int readline (const char *const prompt)
case '\n':
*p = '\0';
puts ("\r\n");
case '\n':
*p = '\0';
puts ("\r\n");
- return (p -
console_buffer
);
+ return (p -
p_buf
);
case '\0': /* nul */
continue;
case 0x03: /* ^C - break */
case '\0': /* nul */
continue;
case 0x03: /* ^C - break */
-
console_buffer[0] = '\0';
/* discard input */
+
p_buf[0] = '\0';
/* discard input */
return (-1);
case 0x15: /* ^U - erase line */
return (-1);
case 0x15: /* ^U - erase line */
@@
-986,20
+1011,20
@@
int readline (const char *const prompt)
puts (erase_seq);
--col;
}
puts (erase_seq);
--col;
}
- p =
console_buffer
;
+ p =
p_buf
;
n = 0;
continue;
n = 0;
continue;
- case 0x17: /* ^W - erase word */
- p=delete_char(
console_buffer
, p, &col, &n, plen);
+ case 0x17: /* ^W - erase word */
+ p=delete_char(
p_buf
, p, &col, &n, plen);
while ((n > 0) && (*p != ' ')) {
while ((n > 0) && (*p != ' ')) {
- p=delete_char(
console_buffer
, p, &col, &n, plen);
+ p=delete_char(
p_buf
, p, &col, &n, plen);
}
continue;
case 0x08: /* ^H - backspace */
case 0x7F: /* DEL - backspace */
}
continue;
case 0x08: /* ^H - backspace */
case 0x7F: /* DEL - backspace */
- p=delete_char(
console_buffer
, p, &col, &n, plen);
+ p=delete_char(
p_buf
, p, &col, &n, plen);
continue;
default:
continue;
default:
@@
-1012,7
+1037,7
@@
int readline (const char *const prompt)
/* if auto completion triggered just continue */
*p = '\0';
if (cmd_auto_complete(prompt, console_buffer, &n, &col)) {
/* if auto completion triggered just continue */
*p = '\0';
if (cmd_auto_complete(prompt, console_buffer, &n, &col)) {
- p =
console_buffer + n;
/* reset */
+ p =
p_buf + n;
/* reset */
continue;
}
#endif
continue;
}
#endif
@@
-1029,12
+1054,13
@@
int readline (const char *const prompt)
}
}
}
}
}
}
-#endif /* CONFIG_CMDLINE_EDITING */
+#ifdef CONFIG_CMDLINE_EDITING
+ }
+#endif
}
/****************************************************************************/
}
/****************************************************************************/
-#ifndef CONFIG_CMDLINE_EDITING
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
{
char *s;
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
{
char *s;
@@
-1064,7
+1090,6
@@
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
(*np)--;
return (p);
}
(*np)--;
return (p);
}
-#endif /* CONFIG_CMDLINE_EDITING */
/****************************************************************************/
/****************************************************************************/
@@
-1219,6
+1244,8
@@
static void process_macros (const char *input, char *output)
if (outputcnt)
*output = 0;
if (outputcnt)
*output = 0;
+ else
+ *(output - 1) = 0;
#ifdef DEBUG_PARSER
printf ("[PROCESS_MACROS] OUTPUT len %d: \"%s\"\n",
#ifdef DEBUG_PARSER
printf ("[PROCESS_MACROS] OUTPUT len %d: \"%s\"\n",
@@
-1337,7
+1364,7
@@
int run_command (const char *cmd, int flag)
continue;
}
continue;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_BOOTD)
+#if
defined(CONFI
G_CMD_BOOTD)
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
#ifdef DEBUG_PARSER
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
#ifdef DEBUG_PARSER
@@
-1351,7
+1378,7
@@
int run_command (const char *cmd, int flag)
flag |= CMD_FLAG_BOOTD;
}
}
flag |= CMD_FLAG_BOOTD;
}
}
-#endif
/* CFG_CMD_BOOTD */
+#endif
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
@@
-1362,7
+1389,7
@@
int run_command (const char *cmd, int flag)
/* Did the user stop this? */
if (had_ctrlc ())
/* Did the user stop this? */
if (had_ctrlc ())
- return
0;
/* if stopped then not repeatable */
+ return
-1;
/* if stopped then not repeatable */
}
return rc ? rc : repeatable;
}
return rc ? rc : repeatable;
@@
-1370,7
+1397,7
@@
int run_command (const char *cmd, int flag)
/****************************************************************************/
/****************************************************************************/
-#if
(CONFIG_COMMANDS & CF
G_CMD_RUN)
+#if
defined(CONFI
G_CMD_RUN)
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
@@
-1398,4
+1425,4
@@
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
return 0;
}
}
return 0;
}
-#endif
/* CFG_CMD_RUN */
+#endif