diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 17:18:14 (GMT) |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 17:18:14 (GMT) |
| commit | 0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch) | |
| tree | fc05bf5db93e5a9c1712d24a5efdff94685063c2 /include/configs/sbc8260.h | |
| parent | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff) | |
| parent | 81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff) | |
| download | u-boot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/sbc8260.h')
| -rw-r--r-- | include/configs/sbc8260.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 7993137..b92344c 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -306,7 +306,8 @@ */ #undef CONFIG_AUTOBOOT_KEYED #ifdef CONFIG_AUTOBOOT_KEYED -# define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, press \" \" to stop\n" +# define CONFIG_AUTOBOOT_PROMPT \ + "Autobooting in %d seconds, press \" \" to stop\n", bootdelay # define CONFIG_AUTOBOOT_STOP_STR " " # undef CONFIG_AUTOBOOT_DELAY_STR # define DEBUG_BOOTKEYS 0 |