configs: Re-sync almost all of cmd/Kconfig

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

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 2a785b3fc31590983f420aea2becffca1131b598..3ef7257127c78958ebb302f155167808c1a4b6f9 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -12,11 +12,6 @@
 #define CONFIG_AMCORE
 #define CONFIG_HOSTNAME                        AMCORE
 
-#define CONFIG_SYS_GENERIC_BOARD
-
-#define CONFIG_MCF530x
-#define CONFIG_M5307
-
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
@@ -26,18 +21,10 @@
 #define CONFIG_BOOTDELAY               1
 #define CONFIG_BOOTCOMMAND             "bootm ffc20000"
 
-#include <config_cmd_default.h>
 #undef CONFIG_CMD_AES
-#undef CONFIG_CMD_BOOTD
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_XIMG
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_TIMER
 #define CONFIG_CMD_DIAG
 
-#define CONFIG_SYS_PROMPT              "amcore $ "
 /* undef to save memory        */
 #undef CONFIG_SYS_LONGHELP
 
@@ -57,7 +44,6 @@
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET  1 /* no console @ startup       */
 #define CONFIG_AUTO_COMPLETE           1 /* add autocompletion support */
-#define CONFIG_LOOPW                   1 /* enable loopw command       */
 #define CONFIG_MX_CYCLIC               1 /* enable mdc/mwc commands    */
 
 #define CONFIG_SYS_LOAD_ADDR           0x20000 /* default load address */
@@ -103,6 +89,10 @@
 #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*);
+
 /* memory map space for linux boot data */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)