diff options
Diffstat (limited to 'board/sixnet')
| -rw-r--r-- | board/sixnet/flash.c | 14 | ||||
| -rw-r--r-- | board/sixnet/u-boot.lds | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/sixnet/flash.c b/board/sixnet/flash.c index 61d758085c..3f2329966a 100644 --- a/board/sixnet/flash.c +++ b/board/sixnet/flash.c @@ -23,7 +23,7 @@ #include <common.h> #include <mpc8xx.h> -/* environment.h defines the various CFG_ENV_... values in terms +/* environment.h defines the various CONFIG_ENV_... values in terms * of whichever ones are given in the configuration file. */ #include <environment.h> @@ -108,16 +108,16 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_ADDR +#ifdef CONFIG_ENV_ADDR flash_protect ( FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); #endif -#ifdef CFG_ENV_ADDR_REDUND +#ifdef CONFIG_ENV_ADDR_REDUND flash_protect ( FLAG_PROTECT_SET, - CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, + CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1, &flash_info[0]); #endif diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds index b91c44a57d..974e45cabf 100644 --- a/board/sixnet/u-boot.lds +++ b/board/sixnet/u-boot.lds @@ -53,7 +53,7 @@ SECTIONS .text : { cpu/mpc8xx/start.o (.text) - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) *(.got1) |
