X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fsun4i.h;h=bd349694c6410529c3bb3afcf6adebe000329ea6;hb=02e80f0c11e4ae0ff6672df30f8520b393f269ad;hp=e0ec52dcde7fb7c296c5a92acca7a5bc4ab062c4;hpb=c88eaea0a0a809884388c3a5727d960bac0b0ced;p=u-boot

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index e0ec52dcde..bd349694c6 100644
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -11,26 +11,18 @@
 /*
  * A10 specific configuration
  */
-#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 */