rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 8a74c4f..cc3ef1c 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -417,17 +417,17 @@
  */
 #ifdef ENVIRONMENT_IN_EEPROM
 
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars */
-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
-#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environment vars */
-#define CFG_ENV_ADDR           0xFFFF8000      /* environment starts at the first small sector */
-#define CFG_ENV_SECT_SIZE      0x2000  /* 8196 bytes may be used for env vars*/
-#define CFG_ENV_ADDR_REDUND    0xFFFFA000
-#define CFG_ENV_SIZE_REDUND    0x2000
+#define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environment vars */
+#define CONFIG_ENV_ADDR                0xFFFF8000      /* environment starts at the first small sector */
+#define CONFIG_ENV_SECT_SIZE   0x2000  /* 8196 bytes may be used for env vars*/
+#define CONFIG_ENV_ADDR_REDUND 0xFFFFA000
+#define CONFIG_ENV_SIZE_REDUND 0x2000
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
@@ -454,16 +454,6 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10   /* and takes up to 10 msec */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                16384   /* For AMCC 405 CPUs, older 405 ppc's   */
-                                       /* have only 8kB, 16kB is save here     */
-#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:
  *
@@ -506,7 +496,7 @@
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 /* This is the base address (on 405EP-side) used to generate I/O accesses on PCI bus */
 #define CFG_ISA_IO 0xE8000000
-/* see also drivers/videomodes.c */
+/* see also drivers/video/videomodes.c */
 #define CFG_DEFAULT_VIDEO_MODE 0x303
 #endif