summaryrefslogtreecommitdiff
path: root/include/configs/mecp5200.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
commitafbc526336447a7357e9c82852df0377d09a8089 (patch)
tree63360d749d3f02916a1239b3862c68d41d3f3d19 /include/configs/mecp5200.h
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadu-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.zip
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.gz
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.bz2
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/mecp5200.h')
-rw-r--r--include/configs/mecp5200.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 75040fe..8b13fc0 100644
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -180,7 +180,7 @@
*/
#define CFG_FLASH_BASE 0xFFC00000
#define CFG_FLASH_SIZE 0x00400000
-#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x003E0000)
+#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + 0x003E0000)
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
@@ -191,14 +191,14 @@
* Environment settings
*/
#if 1 /* test-only */
-#define CFG_ENV_IS_IN_FLASH 1
-#define CFG_ENV_SIZE 0x10000
-#define CFG_ENV_SECT_SIZE 0x10000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE 0x10000
+#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_OVERWRITE 1
#else
-#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars*/
+#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
+#define CONFIG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars*/
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif