diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-06 15:12:38 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-06 15:12:38 +0200 |
| commit | 7772c13ba07eaabd42499998f3713b23350fc119 (patch) | |
| tree | 32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc /include/configs/lwmon5.h | |
| parent | b2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff) | |
| parent | 0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff) | |
| download | u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.zip u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.gz u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.bz2 | |
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
MAKEALL
Makefile
Diffstat (limited to 'include/configs/lwmon5.h')
| -rw-r--r-- | include/configs/lwmon5.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index cf406c8..2f3a066 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -277,7 +277,8 @@ #define CONFIG_POST_KEY_MAGIC "3C+3E" /* press F3 + F5 keys to force POST */ #if 0 #define CONFIG_AUTOBOOT_KEYED /* Enable "password" protection */ -#define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n" +#define CONFIG_AUTOBOOT_PROMPT \ + "\nEnter password - autoboot in %d sec...\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR " " /* "password" */ #endif |