rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index ea3b0b4..b457272 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -77,10 +77,10 @@
 #define CONFIG_MISC_INIT_R 1
 
   /* JSE has EEPROM chips that are good for environment. */
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_EEPROM 1
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_EEPROM 1
+#undef CONFIG_ENV_IS_NOWHERE
 
   /* This is the 7bit address of the device, not including P. */
 #define CFG_I2C_EEPROM_ADDR 0x50
@@ -92,8 +92,8 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS 4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
   /* Put the environment in the second half. */
-#define CFG_ENV_OFFSET 0x00
-#define CFG_ENV_SIZE   512
+#define CONFIG_ENV_OFFSET      0x00
+#define CONFIG_ENV_SIZE        512
 
 
   /* The JSE connects UART1 to the console tap connector. */
@@ -279,15 +279,6 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                16384   /* For AMCC 405GPr 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:
  *