Fix merge problems

[platform/kernel/u-boot.git] / include / configs / DU440.h

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index f193a43..64c9ac0 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -158,7 +158,7 @@
 #define CFG_MBYTES_SDRAM        (1024) /* 512 MiB      TODO: remove    */
 #define CONFIG_DDR_DATA_EYE            /* use DDR2 optimization        */
 #define CFG_MEM_TOP_HIDE        (4 << 10) /* don't use last 4kbytes     */
-                                        /* 440EPx errata CHIP 11        */
+                                       /* 440EPx errata CHIP 11        */
 #define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for setup     */
 #define CONFIG_DDR_ECC                 /* Use ECC when available       */
 #define SPD_EEPROM_ADDRESS     {0x50}
@@ -345,8 +345,9 @@ int du440_phy_addr(int devnum);
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
 #define CONFIG_VERSION_VARIABLE 1      /* include version env variable */
 
-#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_KEYED  1
+#define CONFIG_AUTOBOOT_PROMPT \
+       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 #define CONFIG_AUTOBOOT_STOP_STR " "
 
@@ -375,11 +376,11 @@ int du440_phy_addr(int devnum);
 #define CFG_FLASH              CFG_FLASH_BASE
 
 #define CFG_CPLD_BASE          0xC0000000
-#define CFG_CPLD_RANGE                 0x00000010
+#define CFG_CPLD_RANGE         0x00000010
 #define CFG_DUMEM_BASE         0xC0100000
-#define CFG_DUMEM_RANGE        0x00100000
+#define CFG_DUMEM_RANGE                0x00100000
 #define CFG_DUIO_BASE          0xC0200000
-#define CFG_DUIO_RANGE                 0x00010000
+#define CFG_DUIO_RANGE         0x00010000
 
 #define CFG_NAND0_CS           2               /* NAND chip connected to CSx */
 #define CFG_NAND1_CS           3               /* NAND chip connected to CSx */