Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / include / configs / amcore.h

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index acae6914e598410b1c8210bd625c95646ddef585..5f8b6c5518f72bc28d08904754d616db36a5658f 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -87,15 +87,14 @@
 #define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN      (64 * 1024)
 
-#define CONFIG_ENV_IS_IN_FLASH         1
 #define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE + \
                                         CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SIZE                        0x1000
 #define CONFIG_ENV_SECT_SIZE           0x1000
 
 #define LDS_BOARD_TEXT \
-        . = DEFINED(env_offset) ? env_offset : .; \
-        common/env_embedded.o (.text*);
+       . = DEFINED(env_offset) ? env_offset : .; \
+       env/embedded.o(.text*);
 
 /* memory map space for linux boot data */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)