summaryrefslogtreecommitdiff
path: root/include/configs/PM520.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/PM520.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/PM520.h')
-rw-r--r--include/configs/PM520.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 5e0bb05..2676d7d 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -212,7 +212,7 @@
#define CFG_FLASH_SIZE 0x04000000
#define CFG_BOOTROM_BASE 0xFFF00000
#define CFG_BOOTROM_SIZE 0x00080000
-#define CFG_ENV_ADDR (0xFDF00000 + 0x40000)
+#define CONFIG_ENV_ADDR (0xFDF00000 + 0x40000)
#else
/*
* Flash configuration (8,16 or 32 MB)
@@ -225,7 +225,7 @@
*/
#define CFG_FLASH_BASE 0xFC000000
#define CFG_FLASH_SIZE 0x04000000
-#define CFG_ENV_ADDR (0xFFF00000 + 0x40000)
+#define CONFIG_ENV_ADDR (0xFFF00000 + 0x40000)
#endif
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
@@ -245,9 +245,9 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
-#define CFG_ENV_SIZE 0x10000
-#define CFG_ENV_SECT_SIZE 0x40000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE 0x10000
+#define CONFIG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
/*