summaryrefslogtreecommitdiff
path: root/board/exbitgen
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
commitafbc526336447a7357e9c82852df0377d09a8089 (patch)
tree63360d749d3f02916a1239b3862c68d41d3f3d19 /board/exbitgen
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadu-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.zip
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.gz
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.bz2
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/exbitgen')
-rw-r--r--board/exbitgen/flash.c6
-rw-r--r--board/exbitgen/u-boot.lds2
2 files changed, 4 insertions, 4 deletions
diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c
index 4dd5382..745fba2 100644
--- a/board/exbitgen/flash.c
+++ b/board/exbitgen/flash.c
@@ -126,10 +126,10 @@ unsigned long flash_init (void)
#endif
#endif
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
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/exbitgen/u-boot.lds b/board/exbitgen/u-boot.lds
index e4faa44..cf66426 100644
--- a/board/exbitgen/u-boot.lds
+++ b/board/exbitgen/u-boot.lds
@@ -74,7 +74,7 @@ SECTIONS
lib_generic/zlib.o (.text)
/* . = env_offset;*/
- common/environment.o(.text)
+ common/env_embedded.o(.text)
*(.text)
*(.fixup)