Merge git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 4a54cb6cb21e3d70beb07828e1fc67252ee390b4..5f8b6c5518f72bc28d08904754d616db36a5658f 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -15,7 +15,6 @@
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTCOMMAND             "bootm ffc20000"
@@ -31,9 +30,6 @@
                "erase 0xfff00000 0xffffffff; "                 \
                "cp.b 0x20000 0xfff00000 ${filesize}\0"
 
-#undef CONFIG_CMD_AES
-#define CONFIG_CMD_DIAG
-
 /* undef to save memory        */
 #undef CONFIG_SYS_LONGHELP
 
@@ -91,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)