From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] omap5: Correct include order, drop CONFIG_SYS_PROMPT define
Date: Tue, 27 Aug 2013 10:57:39 -0400 [thread overview]
Message-ID: <1377615459-5288-1-git-send-email-trini@ti.com> (raw)
In-Reply-To: <201308271543.57553.marex@denx.de>
With the new include structure for TI platforms, we need to not define
our own CONFIG_SYS_PROMPT and also need to include
<configs/omap5_common.h> much sooner, so do both of these. Also drop
the unused CONFIG_NET_MULTI
Signed-off-by: Tom Rini <trini@ti.com>
---
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 0bba84b..3c4249b 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 <configs/omap5_common.h>
+
#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 <configs/omap5_common.h>
-
#endif /* __CONFIG_OMAP5_EVM_H */
--
1.7.9.5
next prev parent reply other threads:[~2013-08-27 14:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 13:43 [U-Boot] [PULL] u-boot-usb/master Marek Vasut
2013-08-27 14:57 ` Tom Rini [this message]
2013-08-28 12:26 ` [U-Boot] [PATCH] omap5: Correct include order, drop CONFIG_SYS_PROMPT define Tom Rini
2013-08-28 12:27 ` [U-Boot] [PULL] u-boot-usb/master Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377615459-5288-1-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox