rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 8f2a5ec..0cc4fe4 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -195,7 +195,7 @@
 */
 
 /* NAND flash support */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CONFIG_MTD_NAND_ECC_JFFS2
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices   */
 #define SECTORSIZE 512
@@ -204,7 +204,7 @@
 #define ADDR_PAGE 2
 #define ADDR_COLUMN_PAGE 3
 
-#define NAND_ChipID_UNKNOWN    0x00
+#define NAND_ChipID_UNKNOWN    0x00
 #define NAND_MAX_FLOORS 1
 #define NAND_MAX_CHIPS 1
 
@@ -250,7 +250,7 @@
 #define CFG_MEMTEST_START      0x0100000       /* memtest works on     */
 #define CFG_MEMTEST_END                0x0400000       /* 1 ... 4 MB in DRAM   */
 
-#define CFG_LOAD_ADDR          0x00100000
+#define CFG_LOAD_ADDR          0x00100000
 
 #define        CFG_HZ          1000            /* decrementer freq: 1 ms ticks */
 
@@ -449,23 +449,23 @@
 
 #define CONFIG_RESET_ON_PANIC          /* reset if system panic() */
 
-#define CFG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
   /* environment is in FLASH */
-  #define CFG_ENV_ADDR         0xF8040000      /* AM29LV641 or AM29LV800BT */
-  #define CFG_ENV_ADDR_REDUND  0xF8050000      /* AM29LV641 or AM29LV800BT */
-  #define CFG_ENV_SECT_SIZE    0x00010000
-  #define CFG_ENV_SIZE         0x00002000
+  #define CONFIG_ENV_ADDR              0xF8040000      /* AM29LV641 or AM29LV800BT */
+  #define CONFIG_ENV_ADDR_REDUND       0xF8050000      /* AM29LV641 or AM29LV800BT */
+  #define CONFIG_ENV_SECT_SIZE 0x00010000
+  #define CONFIG_ENV_SIZE              0x00002000
 #else
   /* environment is in EEPROM */
-  #define CFG_ENV_IS_IN_EEPROM         1
-  #define CFG_ENV_OFFSET               0       /* at beginning of EEPROM */
-  #define CFG_ENV_SIZE              1024       /* Use only a part of it*/
+  #define CONFIG_ENV_IS_IN_EEPROM              1
+  #define CONFIG_ENV_OFFSET            0       /* at beginning of EEPROM */
+  #define CONFIG_ENV_SIZE                   1024       /* Use only a part of it*/
 #endif
 
 #if 1
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "delayabit"
 #define CONFIG_AUTOBOOT_STOP_STR       " " /* easy to stop for now */
 #endif