diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:06 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:06 +0200 |
| commit | 0e8d158664a913392cb01fb11a948d83f72e105e (patch) | |
| tree | 9e0a45c86828b4549b77c7867320e867401d9c86 /board/cmi | |
| parent | 1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df (diff) | |
| download | blackbird-obmc-uboot-0e8d158664a913392cb01fb11a948d83f72e105e.tar.gz blackbird-obmc-uboot-0e8d158664a913392cb01fb11a948d83f72e105e.zip | |
rename CFG_ENV macros to CONFIG_ENV
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/cmi')
| -rw-r--r-- | board/cmi/cmi.c | 2 | ||||
| -rw-r--r-- | board/cmi/flash.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/board/cmi/cmi.c b/board/cmi/cmi.c index 8501cae21a..ee243db66a 100644 --- a/board/cmi/cmi.c +++ b/board/cmi/cmi.c @@ -70,4 +70,4 @@ phys_size_t initdram(int board_type) /* * Absolute environment address for linker file. */ -GEN_ABS(env_start, CFG_ENV_OFFSET + CFG_FLASH_BASE); +GEN_ABS(env_start, CONFIG_ENV_OFFSET + CFG_FLASH_BASE); diff --git a/board/cmi/flash.c b/board/cmi/flash.c index aec6a8ef92..0d4582b239 100644 --- a/board/cmi/flash.c +++ b/board/cmi/flash.c @@ -37,14 +37,14 @@ #include <mpc5xx.h> #if defined(CONFIG_ENV_IS_IN_FLASH) -# 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 -# 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 @@ -113,8 +113,8 @@ unsigned long flash_init (void) #ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1, &flash_info[0]); #endif |
