summaryrefslogtreecommitdiffstats
path: root/board/ip860
diff options
context:
space:
mode:
Diffstat (limited to 'board/ip860')
-rw-r--r--board/ip860/flash.c20
-rw-r--r--board/ip860/u-boot.lds2
-rw-r--r--board/ip860/u-boot.lds.debug2
3 files changed, 12 insertions, 12 deletions
diff --git a/board/ip860/flash.c b/board/ip860/flash.c
index 2cf23b3e8c..10a96c58fd 100644
--- a/board/ip860/flash.c
+++ b/board/ip860/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
@@ -94,11 +94,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
return (size);
diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index ef88297930..8335364251 100644
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
lib_ppc/ticks.o (.text)
/**
. = env_offset;
- common/environment.o(.text)
+ common/env_embedded.o(.text)
**/
*(.text)
*(.fixup)
diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index ad685e6f8d..e8a47f7a0b 100644
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -62,7 +62,7 @@ SECTIONS
lib_ppc/ticks.o (.text)
/**
. = env_offset;
- common/environment.o(.text)
+ common/env_embedded.o(.text)
**/
*(.text)
*(.fixup)
OpenPOWER on IntegriCloud