Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / sun4i.h

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index d0191a32b1a6d99807cf75becf4821f2e6879cfd..bd349694c6410529c3bb3afcf6adebe000329ea6 100644 (file)
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -11,27 +11,18 @@
 /*
  * A10 specific configuration
  */
-#define CONFIG_SUN4I           /* sun4i SoC generation */
-#define CONFIG_CLK_FULL_SPEED          1008000000
 
-#define CONFIG_SYS_PROMPT              "sun4i# "
-#define CONFIG_MACH_TYPE               4104
-
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_SUNXI
-
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#ifndef CONFIG_SUNXI_USB_VBUS0_GPIO
-#define CONFIG_SUNXI_USB_VBUS0_GPIO    SUNXI_GPH(6)
-#endif
-#ifndef CONFIG_SUNXI_USB_VBUS1_GPIO
-#define CONFIG_SUNXI_USB_VBUS1_GPIO    SUNXI_GPH(3)
-#endif
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  3
+
 /*
  * Include common sunxi configuration where most the settings are
  */
 #include <configs/sunxi-common.h>
 
+#define CONFIG_MACH_TYPE       (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
+
 #endif /* __CONFIG_H */