X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigs%2FG2000.h;h=81a12f159d64a78f4284976b0dbe813ecc44321d;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=9c713c6c26f2fdca67f67efa14b4a59744cb34f1;hpb=f2c2a937d8c4a44f63ff88bf82023e03a29497a2;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 9c713c6..81a12f15 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -299,16 +299,16 @@
  * Environment Variable setup
  */
 #if 1 /* test-only */
-#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 bytes may be used for env vars*/
+#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 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		0xFFFA0000 /* environment starts before u-boot */
-#define CFG_ENV_SECT_SIZE	0x20000	/* 128k bytes may be used for env vars*/
+#define CONFIG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars */
+#define CONFIG_ENV_ADDR		0xFFFA0000 /* environment starts before u-boot */
+#define CONFIG_ENV_SECT_SIZE	0x20000	/* 128k bytes may be used for env vars*/
 
 #endif
 
@@ -331,16 +331,6 @@
 #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
-
-/*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
  */