configs: Re-sync HUSH options

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

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 37aa124..bbab8b2 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -12,9 +12,6 @@
 #define CONFIG_AMCORE
 #define CONFIG_HOSTNAME                        AMCORE
 
-#define CONFIG_MCF530x
-#define CONFIG_M5307
-
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
@@ -24,18 +21,11 @@
 #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
 
@@ -101,6 +91,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)