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 /board/amcc/walnut/flash.c | |
| 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 'board/amcc/walnut/flash.c')
| -rw-r--r-- | board/amcc/walnut/flash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c index 056f9b9..fe6ca6c 100644 --- a/board/amcc/walnut/flash.c +++ b/board/amcc/walnut/flash.c @@ -82,12 +82,12 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif |