Fix merge problems

[karo-tx-uboot.git] / include / configs / MVBLUE.h

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index d08d79520c97c2f00f542afa4737398d3ac6c9ae..8e247af63cd43cff672a493cae02366511d5e9cf 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -59,17 +59,18 @@
 
 #define CONFIG_CLOCKS_IN_MHZ   1
 
-#define CONFIG_BOARD_TYPES    1
+#define CONFIG_BOARD_TYPES     1
 
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_BOOTDELAY               3
+#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOT_RETRY_TIME -1
 
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds (stop with 's')...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "autoboot in %d seconds (stop with 's')...\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       "s"
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_RESET_TO_RETRY          60