diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
commit | 225f0eaa745adfae05931848543d99942798756a (patch) | |
tree | f5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /include/configs/uc100.h | |
parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
download | u-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/uc100.h')
-rw-r--r-- | include/configs/uc100.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 106e6f2..22ebf07 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -241,14 +241,14 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) -#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ -#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ +#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ -#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE) -#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) /*----------------------------------------------------------------------- * Cache Configuration |