summaryrefslogtreecommitdiff
path: root/include/configs/grsim.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/grsim.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/grsim.h')
-rw-r--r--include/configs/grsim.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f880a7b..a5ef6e1 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -181,9 +181,9 @@
#define CFG_NO_FLASH 1
#define CFG_FLASH_BASE 0x00000000
#define CFG_FLASH_SIZE 0x00800000
-#define CFG_ENV_SIZE 0x8000
+#define CONFIG_ENV_SIZE 0x8000
-#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SIZE)
#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */
#define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */
@@ -209,10 +209,10 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH 0*/
-/*#define CFG_ENV_SIZE 0x8000*/
-#define CFG_ENV_SECT_SIZE 0x40000
+#define CONFIG_ENV_IS_NOWHERE 1
+/*#define CONFIG_ENV_IS_IN_FLASH*/
+/*#define CONFIG_ENV_SIZE 0x8000*/
+#define CONFIG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
/*