rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[karo-tx-uboot.git] / include / configs / MPC837XERDB.h

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index f7e6fd2c52bec95b0d05c15adc56b29d22f29f18..7ffc743c351299a0028a653eb2323b18eeeb98c7 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -249,7 +249,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000 /* FLASH base address */
 #define CFG_FLASH_SIZE         8 /* max FLASH size is 32M */
 
@@ -442,13 +442,13 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x10000 /* 64K (one sector) for env */
        #define CFG_ENV_SIZE            0x4000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE-0x1000)
        #define CFG_ENV_SIZE            0x2000
 #endif
@@ -524,6 +524,8 @@
  * MMU Setup
  */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /* DDR: cache cacheable */
 #define CFG_SDRAM_LOWER                CFG_SDRAM_BASE
 #define CFG_SDRAM_UPPER                (CFG_SDRAM_BASE + 0x10000000)