diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 | 
| commit | afbc526336447a7357e9c82852df0377d09a8089 (patch) | |
| tree | 63360d749d3f02916a1239b3862c68d41d3f3d19 /board/o2dnt/flash.c | |
| parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
| parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) | |
| download | olio-uboot-2014.01-afbc526336447a7357e9c82852df0377d09a8089.tar.xz olio-uboot-2014.01-afbc526336447a7357e9c82852df0377d09a8089.zip | |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/o2dnt/flash.c')
| -rw-r--r-- | board/o2dnt/flash.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/board/o2dnt/flash.c b/board/o2dnt/flash.c index 349086ffb..1cf78c7b8 100644 --- a/board/o2dnt/flash.c +++ b/board/o2dnt/flash.c @@ -103,12 +103,12 @@ unsigned long flash_init (void)  			flash_get_info(CFG_MONITOR_BASE));  #endif -#ifdef	CFG_ENV_IS_IN_FLASH +#ifdef	CONFIG_ENV_IS_IN_FLASH  	/* ENV protection ON by default */  	flash_protect(FLAG_PROTECT_SET, -			CFG_ENV_ADDR, -			CFG_ENV_ADDR+CFG_ENV_SIZE-1, -			flash_get_info(CFG_ENV_ADDR)); +			CONFIG_ENV_ADDR, +			CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, +			flash_get_info(CONFIG_ENV_ADDR));  #endif |