diff options
Diffstat (limited to 'board/RRvision')
| -rw-r--r-- | board/RRvision/flash.c | 10 | ||||
| -rw-r--r-- | board/RRvision/u-boot.lds | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c index d8e07e6..6608bca 100644 --- a/board/RRvision/flash.c +++ b/board/RRvision/flash.c @@ -26,8 +26,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 */ @@ -77,11 +77,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 diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 9e767ee..ce1148d 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -66,7 +66,7 @@ SECTIONS lib_ppc/time.o (.text) . = env_offset; - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) *(.text) *(.fixup) |