summaryrefslogtreecommitdiff
path: root/board/evb64260
diff options
context:
space:
mode:
Diffstat (limited to 'board/evb64260')
-rw-r--r--board/evb64260/bootseq.txt2
-rw-r--r--board/evb64260/flash.c8
-rw-r--r--board/evb64260/u-boot.lds2
3 files changed, 6 insertions, 6 deletions
diff --git a/board/evb64260/bootseq.txt b/board/evb64260/bootseq.txt
index 290aed9..e4fefb3 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 6ab23dc..f2d5390 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 1a95755..b6b37ef 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)