mpc83xx: don't disable autoboot

[oweals/u-boot.git] / include / configs / CANBT.h

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index ae32f6b14acd393b21569e54a9b378335de04c1a..be588389c0e7d9d0a18a03ee2a15d75c29edd2e6 100644 (file)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -155,17 +155,17 @@
 
 #if 0 /* Use FLASH for environment variables */
 
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_OFFSET         0x00010000      /* Offset of Environment Sector */
-#define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_OFFSET              0x00010000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector     */
 
-#define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars */
-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x400   /* 1024 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 
@@ -181,15 +181,6 @@
 /* mask of address bits that overflow into the "EEPROM chip address"   */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   0x07
 
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                8192    /* For AMCC 405 CPUs                    */
-#define CFG_CACHELINE_SIZE     32      /* ...                  */
-#if defined(CONFIG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT    5       /* log base 2 of the above value        */
-#endif
-
 /*
  * Init Memory Controller:
  *