Merge branch 'Makefile' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index d3908b9..e5a0fb9 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -82,7 +82,8 @@
 #undef CONFIG_BOOT_RETRY_TIME
 
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "Boot in %02d seconds ('s' to stop)..."
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Boot in %02d seconds ('s' to stop)...", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       "s"
 
 #define CONFIG_CMD_IDE
@@ -433,7 +434,7 @@
  * FLASH organization
  */
 #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        */
 
 #undef  CFG_FLASH_PROTECTION
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }