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

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

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 4d94078..214d9c5 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -22,7 +22,6 @@
  * other needs.
  */
 
-#define CONFIG_SYS_TEXT_BASE           0x80100000
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
 
@@ -62,7 +61,6 @@
 #define CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         10
@@ -171,9 +169,6 @@
        "else run nandboot; fi"
 
 /* Miscellaneous configurable options */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
 
 /* We set the max number of command args high to avoid HUSH bugs. */
 #define CONFIG_SYS_MAXARGS             64
@@ -215,7 +210,6 @@
 #define CONFIG_ENV_ADDR                        0x260000
 
 /* Defines for SPL */
-#define CONFIG_SPL_FRAMEWORK
 #undef CONFIG_SPL_TEXT_BASE
 #define CONFIG_SPL_TEXT_BASE           0x40200000