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

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

diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 5ac6e6441c2928c878d3fbe8fcd8fc6fef17ecbf..834b6169f6fcf7f8764c705f861dc131b773db2b 100644 (file)
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -21,12 +21,12 @@
 
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* 256 kB for U-Boot */
 
-#define CONFIG_SPL
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 #define CONFIG_SPL_LDSCRIPT            "arch/$(ARCH)/cpu/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE            2048
 #define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
 
 #define CONFIG_SPL_TEXT_BASE           0x810c0000
 #define CONFIG_SYS_TEXT_BASE           0x81200000
@@ -123,7 +123,6 @@
 #define CONFIG_SYS_LONGHELP
 
 /* U-Boot commands */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_CACHE
 
@@ -133,7 +132,6 @@
 #define CONFIG_FEC_MXC
 #define CONFIG_FEC_MXC_PHYADDR         0x1f
 #define CONFIG_MII
-#define CONFIG_CMD_NET
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_ENV_OVERWRITE