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/evb64260 | |
parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/evb64260')
-rw-r--r-- | board/evb64260/bootseq.txt | 2 | ||||
-rw-r--r-- | board/evb64260/flash.c | 8 | ||||
-rw-r--r-- | board/evb64260/u-boot.lds | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/board/evb64260/bootseq.txt b/board/evb64260/bootseq.txt index 290aed90a52..e4fefb31dd0 100644 --- a/board/evb64260/bootseq.txt +++ b/board/evb64260/bootseq.txt @@ -88,7 +88,7 @@ in_flash: nothing mem_malloc_init malloc_bin_reloc - spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM) + spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM) env_relocated misc_init_r(bd): (board/evb64260/evb64260.c) mpsc_init2 diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c index 6ab23dce2f7..f2d5390ac47 100644 --- a/board/evb64260/flash.c +++ b/board/evb64260/flash.c @@ -119,12 +119,12 @@ flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #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, - flash_get_info(CFG_ENV_ADDR)); + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, + flash_get_info(CONFIG_ENV_ADDR)); #endif flash_size = size_b0 + size_b1; diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds index 1a95755ab49..b6b37ef34f0 100644 --- a/board/evb64260/u-boot.lds +++ b/board/evb64260/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ -/* common/environment.o(.text) */ +/* common/env_embedded.o(.text) */ *(.text) *(.fixup) |