diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
| commit | 0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch) | |
| tree | fc05bf5db93e5a9c1712d24a5efdff94685063c2 /include/configs/linkstation.h | |
| parent | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff) | |
| parent | 81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff) | |
| download | u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.zip u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.gz u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/linkstation.h')
| -rw-r--r-- | include/configs/linkstation.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index d3908b9..bc64294 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -82,7 +82,8 @@ #undef CONFIG_BOOT_RETRY_TIME #define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..." +#define CONFIG_AUTOBOOT_PROMPT \ + "Boot in %02d seconds ('s' to stop)...", bootdelay #define CONFIG_AUTOBOOT_STOP_STR "s" #define CONFIG_CMD_IDE |