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/svm_sc8xx/flash.c | |
| parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
| parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) | |
| download | u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.zip u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.gz u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.bz2 | |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/svm_sc8xx/flash.c')
| -rw-r--r-- | board/svm_sc8xx/flash.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c index 25e61dd..00fed59 100644 --- a/board/svm_sc8xx/flash.c +++ b/board/svm_sc8xx/flash.c @@ -23,8 +23,8 @@ #include <common.h> #include <mpc8xx.h> -#ifndef CFG_ENV_ADDR -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#ifndef CONFIG_ENV_ADDR +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) #endif flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ @@ -152,11 +152,11 @@ unsigned long flash_init (void) &flash_info[0]); #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, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, &flash_info[0]); #endif @@ -179,11 +179,11 @@ unsigned long flash_init (void) &flash_info[1]); #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, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, &flash_info[1]); #endif } else { |