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

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

diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 16b901b01b758c303c2227cef5fcb58b538a2eec..72296a03ddb601c4220f952d202473fa7a5f12cb 100644 (file)
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -69,13 +69,6 @@
 /* NYET -- #define CONFIG_USB_DAVINCI */
 
 /* U-Boot command configuration */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
@@ -103,11 +96,11 @@
 #endif
 
 #ifdef CONFIG_USB_DAVINCI
-#define CONFIG_MUSB_HCD
+#define CONFIG_USB_MUSB_HCD
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
 #else
-#undef CONFIG_MUSB_HCD
+#undef CONFIG_USB_MUSB_HCD
 #undef CONFIG_CMD_USB
 #undef CONFIG_USB_STORAGE
 #endif
@@ -117,7 +110,6 @@
 
 /* U-Boot general configuration */
 #define CONFIG_BOOTFILE                "uImage"        /* Boot file name */
-#define CONFIG_SYS_PROMPT      "DM355 EVM # "  /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE                      /* Print buffer size */ \
                (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)