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

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

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 8d7ec59..16d2363 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -203,13 +203,13 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_NVRAM   1                     /* Environment uses NVRAM  */
-#undef CFG_ENV_IS_IN_FLASH                  /* ... not in flash        */
-#undef CFG_ENV_IS_IN_EEPROM                 /* ... not in EEPROM       */
+#define CONFIG_ENV_IS_IN_NVRAM   1                  /* Environment uses NVRAM  */
+#undef CONFIG_ENV_IS_IN_FLASH               /* ... not in flash        */
+#undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 
-#define CFG_ENV_SIZE         0x1000         /* Size of Env vars        */
-#define CFG_ENV_ADDR         (CFG_NVRAM_BASE_ADDR)
+#define CONFIG_ENV_SIZE              0x1000         /* Size of Env vars        */
+#define CONFIG_ENV_ADDR              (CFG_NVRAM_BASE_ADDR)
 
 #define CONFIG_BOOTARGS              "console=ttyS0,9600 root=/dev/nfs rw nfsroot=$serverip:/home/metrobox0 nfsaddrs=$ipaddr:::::eth0:none "
 #define CONFIG_BOOTCOMMAND    "tftp 8000000 pImage.metrobox;bootm 8000000"
@@ -346,14 +346,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CFG_BOOTMAPSZ          (8 << 20) /* Initial Memory map for Linux */
-/*-----------------------------------------------------------------------
- * 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 */
-#endif
 
 /*
  * Internal Definitions