diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /include/configs/utx8245.h | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
| download | talos-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz talos-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
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 287a6187a2..1675ab752c 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 */ |
