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/gth2.h | |
| parent | b2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff) | |
| parent | 0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff) | |
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
MAKEALL
Makefile
Diffstat (limited to 'include/configs/gth2.h')
| -rw-r--r-- | include/configs/gth2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/gth2.h b/include/configs/gth2.h index c2d6ca70a5..7f7190bcdb 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -54,8 +54,9 @@ /* Only interrupt boot if space is pressed */ /* If a long serial cable is connected but */ /* other end is dead, garbage will be read */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT "Press space to abort autoboot in %d second\n" +#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT_PROMPT \ + "Press space to abort autoboot in %d second\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" #define CONFIG_AUTOBOOT_STOP_STR " " |