summaryrefslogtreecommitdiff
path: root/include/configs/impa7.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:14:28 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:14:28 +0200
commit225f0eaa745adfae05931848543d99942798756a (patch)
treef5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /include/configs/impa7.h
parent6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff)
parentafbc526336447a7357e9c82852df0377d09a8089 (diff)
downloadu-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip
u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz
u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/configs/impa7.h')
-rw-r--r--include/configs/impa7.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index e9704fc..52eb888 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -41,7 +41,7 @@
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@ -151,9 +151,9 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
-#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
-#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
+#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
/*
* JFFS2 partitions