Move defaults from config_cmd_default.h to Kconfig

[karo-tx-uboot.git] / include / configs / beagle_x15.h

diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h
index c7719f389a6444ac3fc3d901671522695197a99a..17fdded138bd7e8eee535b83884107f01f7a0cf8 100644 (file)
--- a/include/configs/beagle_x15.h
+++ b/include/configs/beagle_x15.h
@@ -14,6 +14,12 @@
 
 #define CONFIG_AM57XX
 
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_IODELAY_RECALIBRATION
+#endif
+
+#define CONFIG_BOARD_EARLY_INIT_F
+
 #define CONFIG_NR_DRAM_BANKS           2
 
 #define CONFIG_ENV_SIZE                        (64 << 10)
@@ -22,8 +28,6 @@
 #define FAT_ENV_DEVICE_AND_PART                "0:1"
 #define FAT_ENV_FILE                   "uboot.env"
 
-#define CONFIG_CMD_SAVEENV
-
 #define CONSOLEDEV                     "ttyO2"
 #define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */
@@ -44,8 +48,6 @@
 #define CONFIG_EFI_PARTITION
 
 /* CPSW Ethernet */
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_NET                 /* 'bootp' and 'tftp' */
 #define CONFIG_CMD_DHCP
 #define CONFIG_BOOTP_DNS               /* Configurable parts of CMD_DHCP */
 #define CONFIG_BOOTP_DNS2
@@ -59,6 +61,7 @@
 #define CONFIG_MII                     /* Required in net/eth.c */
 #define CONFIG_PHY_GIGE                        /* per-board part of CPSW */
 #define CONFIG_PHYLIB
+#define PHY_ANEG_TIMEOUT       8000    /* PHY needs longer aneg time at 1G */
 
 #define CONFIG_SUPPORT_EMMC_BOOT