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/utx8245.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/utx8245.h')
-rw-r--r-- | include/configs/utx8245.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index 287a618..1675ab7 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -58,7 +58,7 @@ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_BOOTDELAY 2 -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n" +#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay #define CONFIG_BOOTCOMMAND "run nfsboot" /* autoboot command */ #define CONFIG_BOOTARGS "root=/dev/ram console=ttyS0,57600" /* RAMdisk */ #define CONFIG_ETHADDR 00:AA:00:14:00:05 /* UTX5 */ |