diff options
Diffstat (limited to 'board/ivm')
| -rw-r--r-- | board/ivm/flash.c | 20 | ||||
| -rw-r--r-- | board/ivm/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/ivm/u-boot.lds.debug | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/board/ivm/flash.c b/board/ivm/flash.c index 140ba2d530..29821ba139 100644 --- a/board/ivm/flash.c +++ b/board/ivm/flash.c @@ -26,15 +26,15 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#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 @@ -91,11 +91,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_SECT_SIZE-1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1, &flash_info[0]); #endif diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds index d7f360f3bb..c869e2781f 100644 --- a/board/ivm/u-boot.lds +++ b/board/ivm/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) diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index 995fc83270..4d49f1bbef 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -62,7 +62,7 @@ SECTIONS lib_ppc/extable.o (.text) . = env_offset; - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) |
