summaryrefslogtreecommitdiff
path: root/include/configs/W7OLMC.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/W7OLMC.h
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadu-boot-afbc526336447a7357e9c82852df0377d09a8089.tar.xz
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/W7OLMC.h')
-rw-r--r--include/configs/W7OLMC.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index bb6b6b9..95e4556 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -249,23 +249,23 @@
/*-----------------------------------------------------------------------
* NVRAM organization
*/
-#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
+#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
#define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
-#define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
-/*define CFG_ENV_ADDR \
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) Env */
-#define CFG_ENV_ADDR CFG_NVRAM_BASE_ADDR
+#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */
+/*define CONFIG_ENV_ADDR \
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) Env */
+#define CONFIG_ENV_ADDR CFG_NVRAM_BASE_ADDR
#else /* Use Boot Flash for environment variables */
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
-#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */
-#define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE 0x10000 /* Total Size of env. sector */
-#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sec tot sze */
+#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sec tot sze */
#endif
/*-----------------------------------------------------------------------