diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-12 14:13:12 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 14:13:12 (GMT) |
commit | afbc526336447a7357e9c82852df0377d09a8089 (patch) | |
tree | 63360d749d3f02916a1239b3862c68d41d3f3d19 /board/exbitgen/flash.c | |
parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) | |
download | u-boot-fsl-qoriq-afbc526336447a7357e9c82852df0377d09a8089.tar.xz |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/exbitgen/flash.c')
-rw-r--r-- | board/exbitgen/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c index 4dd5382..745fba2 100644 --- a/board/exbitgen/flash.c +++ b/board/exbitgen/flash.c @@ -126,10 +126,10 @@ unsigned long flash_init (void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) 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 |