Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / include / configs / omap5_uevm.h

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 0bba84bd4372bdb18dca2a63dd67f9b29cc70e2d..0d1c43c2eb570dbdce1749c30000f65eaca8e7ac 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -17,6 +17,8 @@
        "uuid_disk=${uuid_gpt_disk};" \
        "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
+#include <configs/omap5_common.h>
+
 #define CONFIG_CONS_INDEX              3
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE
 #define CONFIG_BAUDRATE                        115200
@@ -35,6 +37,7 @@
 #define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 
+/* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
 #define CONFIG_CMD_TCA642X
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
@@ -53,7 +56,6 @@
 #define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
 
 /* Enabled commands */
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_DHCP                /* DHCP Support                 */
 #define CONFIG_CMD_NET         /* bootp, tftpboot, rarpboot    */
 #define CONFIG_CMD_NFS         /* NFS support                  */
@@ -62,11 +64,9 @@
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 
-#define CONFIG_SYS_PROMPT              "OMAP5432 uEVM # "
-
 #define CONSOLEDEV             "ttyO2"
-#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC       16296
 
-#include <configs/omap5_common.h>
+/* Max time to hold reset on this board, see doc/README.omap-reset-time */
+#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC       16296
 
 #endif /* __CONFIG_OMAP5_EVM_H */