diff options
| author | Simon Kagstrom <simon.kagstrom@netinsight.net> | 2014-10-28 14:19:00 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-10 01:59:30 +0300 |
| commit | 4b4b13d5fec8a82ed2780c487e49cfc4321a8c14 (patch) | |
| tree | d021c3f9a715abfbc2b51100c7f32e5e61783d60 /arch/powerpc/boot/ops.h | |
| parent | 90029640fd5963343fb862d419db161bc0424120 (diff) | |
| download | linux-4b4b13d5fec8a82ed2780c487e49cfc4321a8c14.tar.xz | |
powerpc/boot: Parse chosen/cmdline-timeout parameter
On some platforms a 5 second timeout during boot might be quite long, so
make it configurable. Run the loop at least once to let the user stop
the boot by holding a key pressed. If the timeout is set to 0, don't
wait for input, which can be used as a workaround if the boot hangs on
random data coming in on the serial port.
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
[mpe: Changelog wording & whitespace]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/boot/ops.h')
| -rw-r--r-- | arch/powerpc/boot/ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h index 8aad3c55aeda..5e75e1c5518e 100644 --- a/arch/powerpc/boot/ops.h +++ b/arch/powerpc/boot/ops.h @@ -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; }; |