summaryrefslogtreecommitdiff
path: root/include/configs/csb472.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/csb472.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/csb472.h')
-rw-r--r--include/configs/csb472.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index d3e5ea8..0644982 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -229,9 +229,9 @@
* Environment configuration
*
*/
-#define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_EEPROM
/*
* General Memory organization
@@ -251,11 +251,11 @@
#define CFG_RAMSTART
#endif
-#if defined(CFG_ENV_IS_IN_FLASH)
-#define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */
-#define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */
-#define CFG_ENV_SIZE 0x00001000 /* Size of Environment */
-#define CFG_ENV_SECT_SIZE 0x00040000 /* Size of Environment Sector */
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+#define CONFIG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */
+#define CONFIG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */
+#define CONFIG_ENV_SIZE 0x00001000 /* Size of Environment */
+#define CONFIG_ENV_SECT_SIZE 0x00040000 /* Size of Environment Sector */
#endif
/*