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

[platform/kernel/u-boot.git] / include / configs / sun5i.h

diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h
index 52e3a6f..ec8f319 100644 (file)
--- a/include/configs/sun5i.h
+++ b/include/configs/sun5i.h
@@ -11,18 +11,18 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_CLK_FULL_SPEED          1008000000
-
-#define CONFIG_MACH_TYPE               4138
 
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  2
+
 /*
  * Include common sunxi configuration where most the settings are
  */
 #include <configs/sunxi-common.h>
 
+#define CONFIG_MACH_TYPE       (4138 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
+
 #endif /* __CONFIG_H */