Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / include / configs / DU440.h

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 0f5f85c22a66cd1351132c4478c9ef08b428e511..c757523aec2b43bc8141922e8cf77682a35f1fa2 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -119,7 +119,7 @@
  * FLASH related
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver       */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver       */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
@@ -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 " "