@@ -144,13 +144,22 @@ static char cmdline[COMMAND_LINE_SIZE]
static void prep_cmdline(void *chosen)
{
+ unsigned int getline_timeout = 5000;
+ int v;
+ int n;
+
+ /* Wait-for-input time */
+ n = getprop(chosen, "cmdline-timeout", &v, sizeof(v));
+ if (n == sizeof(v))
+ getline_timeout = v;
+
if (cmdline[0] == '\0')
getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1);
printf("\n\rLinux/PowerPC load: %s", cmdline);
/* If possible, edit the command line */
if (console_ops.edit_cmdline)
- console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE);
+ console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE, getline_timeout);
printf("\n\r");
/* Put the command line back into the devtree for the kernel */
@@ -58,7 +58,7 @@ extern struct dt_ops dt_ops;
struct console_ops {
int (*open)(void);
void (*write)(const char *buf, int len);
- void (*edit_cmdline)(char *buf, int len);
+ void (*edit_cmdline)(char *buf, int len, unsigned int getline_timeout);
void (*close)(void);
void *data;
};
@@ -33,7 +33,7 @@ static void serial_write(const char *buf, int len)
scdp->putc(*buf++);
}
-static void serial_edit_cmdline(char *buf, int len)
+static void serial_edit_cmdline(char *buf, int len, unsigned int timeout)
{
int timer = 0, count;
char ch, *cp;
@@ -44,7 +44,7 @@ static void serial_edit_cmdline(char *buf, int len)
cp = &buf[count];
count++;
- while (timer++ < 5*1000) {
+ while (timer++ < timeout) {
if (scdp->tstc()) {
while (((ch = scdp->getc()) != '\n') && (ch != '\r')) {
/* Test for backspace/delete */
A 5 second timeout during boot might be too long, so make it configurable. The property is added to the chosen node, e.g., chosen { bootargs = "console=ttyUL0 root=/dev/ram0"; linux,stdout-path = "/plb@0/serial@46000000"; cmdline-timeout = <100>; } ; Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> --- We build a simpleImage for a Virtex 4 PPC405 target, and the delay-for-command-line-edits is a significant part of the total boot time. Questions (apart from the patch in general): - Should the property be in the chosen node? - Naming of the property? Thanks, // Simon arch/powerpc/boot/main.c | 11 ++++++++++- arch/powerpc/boot/ops.h | 2 +- arch/powerpc/boot/serial.c | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-)