rename CFG_ENV macros to CONFIG_ENV

[people/ms/u-boot.git] / include / configs / trab.h

diff --git a/include/configs/trab.h b/include/configs/trab.h
index dbccea28ad364dbde5e92ed0ad7fa5a5d02463ad..d6d463a27956c0acc50762632bb4241c85c6cf5a 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -69,8 +69,8 @@
  * address 0x54 with 8bit addressing
  ***********************************************************/
 #define CONFIG_HARD_I2C                        /* I2C with hardware support */
-#define CFG_I2C_SPEED          100000  /* I2C speed */
-#define CFG_I2C_SLAVE          0x7F    /* I2C slave addr */
+#define CFG_I2C_SPEED          100000  /* I2C speed */
+#define CFG_I2C_SLAVE          0x7F    /* I2C slave addr */
 
 #define CFG_I2C_EEPROM_ADDR    0x54    /* EEPROM address */
 #define CFG_I2C_EEPROM_ADDR_LEN        1       /* 1 address byte */
@@ -94,7 +94,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
@@ -237,7 +237,7 @@
        "mdm_init2=ATS0=1\0" \
        "mdm_flow_control=rts/cts\0"
 #endif /* CFG_HUSH_PARSER */
-#else  /* CONFIG_FLASH_8MB      => 8 MB flash */
+#else  /* CONFIG_FLASH_8MB      => 8 MB flash */
 #ifdef CFG_HUSH_PARSER
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "nfs_args=setenv bootargs root=/dev/nfs rw " \
@@ -289,7 +289,8 @@
 
 #if 1  /* feel free to disable for development */
 #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      "R"     /* 1st "password"       */
 #endif
 
@@ -402,22 +403,24 @@
 #define CFG_FLASH_ERASE_TOUT   (15*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #ifndef CONFIG_FLASH_8MB
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x60000)
-#define CFG_ENV_SIZE           0x4000
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x60000)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x20000
 #else
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x4000)
-#define CFG_ENV_SIZE           0x4000
-#define CFG_ENV_SECT_SIZE      0x4000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x4000)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x4000
 #endif
 
 /* Address and size of Redundant Environment Sector    */
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
+
+#define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /* Initial value of the on-board touch screen brightness */
 #define CFG_BRIGHTNESS 0x20