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/ep8260/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/ep8260/flash.c')
| -rw-r--r-- | board/ep8260/flash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c index 966a345..d32486d 100644 --- a/board/ep8260/flash.c +++ b/board/ep8260/flash.c @@ -157,13 +157,13 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) -# ifndef CFG_ENV_SIZE -# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) +# ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # endif flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); #endif |