From a228296c54a9208d65a0a8bd4f3dddcb76cc69c9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 27 Aug 2013 10:56:18 -0400 Subject: [PATCH] omap5: Correct include order, drop CONFIG_SYS_PROMPT define With the new include structure for TI platforms, we need to not define our own CONFIG_SYS_PROMPT and also need to include much sooner, so do both of these. Also drop the unused CONFIG_NET_MULTI Signed-off-by: Tom Rini --- include/configs/omap5_uevm.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 0bba84bd43..3c4249bdda 100644 --- 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 + #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_BAUDRATE 115200 @@ -53,7 +55,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 +63,7 @@ #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 - #endif /* __CONFIG_OMAP5_EVM_H */ -- 2.30.2