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/cu824/flash.c | |
| parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
| parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) | |
| download | talos-obmc-uboot-afbc526336447a7357e9c82852df0377d09a8089.tar.gz talos-obmc-uboot-afbc526336447a7357e9c82852df0377d09a8089.zip | |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/cu824/flash.c')
| -rw-r--r-- | board/cu824/flash.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/board/cu824/flash.c b/board/cu824/flash.c index 7368176e54..6fe2978c20 100644 --- a/board/cu824/flash.c +++ b/board/cu824/flash.c @@ -25,15 +25,15 @@ #include <mpc824x.h> #include <asm/processor.h> -#if defined(CFG_ENV_IS_IN_FLASH) -# ifndef CFG_ENV_ADDR -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#if defined(CONFIG_ENV_IS_IN_FLASH) +# ifndef CONFIG_ENV_ADDR +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) # endif -# ifndef CFG_ENV_SIZE -# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +# ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # endif -# ifndef CFG_ENV_SECT_SIZE -# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE +# ifndef CONFIG_ENV_SECT_SIZE +# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE # endif #endif @@ -135,16 +135,16 @@ unsigned long flash_init(void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) -#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) +#if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE 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]); #else 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 #endif |
