summaryrefslogtreecommitdiff
path: root/board/exbitgen
diff options
context:
space:
mode:
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 4dd5382876..745fba2af8 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 e4faa446ee..cf66426357 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)