Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 8a82702..e4ee099 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -252,7 +252,8 @@
 #define        CONFIG_POST_KEY_MAGIC   "3C+3E" /* press F3 + F5 keys to force POST */
 #if 0
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable "password" protection */
-#define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "  "    /* "password"   */
 #endif
 /*----------------------------------------------------------------------*/
@@ -314,10 +315,10 @@
 #define CFG_FLASH_BUFFER_SIZE  (2*32)
 
 /* Put environment in flash which is much faster to boot than using the EEPROM */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR       0x40040000  /* Address    of Environment Sector     */
-#define CFG_ENV_SIZE           0x2000  /* Total Size of Environment            */
-#define CFG_ENV_SECT_SIZE      0x40000 /* we have BIG sectors only :-(         */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR            0x40040000  /* Address    of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment            */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* we have BIG sectors only :-(         */
 
 /*-----------------------------------------------------------------------
  * I2C/EEPROM Configuration