Merge branch 'next'

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

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index fc0edacede217b8c9542190cdc922614f8375f5b..a0fe15e86e600b1f8f0d796eac23314ebea56589 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -249,7 +249,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
@@ -289,7 +288,6 @@
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -309,10 +307,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"
@@ -442,8 +436,8 @@
 #define CONFIG_IPADDR    192.168.1.253
 
 #define CONFIG_HOSTNAME                unknown
-#define CONFIG_ROOTPATH                /nfsroot
-#define CONFIG_BOOTFILE                your.uImage
+#define CONFIG_ROOTPATH                "/nfsroot"
+#define CONFIG_BOOTFILE                "your.uImage"
 
 #define CONFIG_SERVERIP  192.168.1.1
 #define CONFIG_GATEWAYIP 192.168.1.1