summaryrefslogtreecommitdiff
path: root/include/configs/G2000.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 14:13:12 (GMT)
committerWolfgang Denk <wd@denx.de>2008-09-12 14:13:12 (GMT)
commitafbc526336447a7357e9c82852df0377d09a8089 (patch)
tree63360d749d3f02916a1239b3862c68d41d3f3d19 /include/configs/G2000.h
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadu-boot-fsl-qoriq-afbc526336447a7357e9c82852df0377d09a8089.tar.xz
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/G2000.h')
-rw-r--r--include/configs/G2000.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index c12ce48..81a12f1 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