Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

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

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index fe8c511448b517d5a617ce30ba84c94c213d2a3c..47f28132407619003072b7aa0604f30329a68723 100644 (file)
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -13,24 +13,19 @@
  * A23 specific configuration
  */
 
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
-#define CONFIG_SUNXI_USB_PHYS  2
-
-#define CONFIG_ARMV7_PSCI              1
-#if defined(CONFIG_MACH_SUN8I_A23)
-#define CONFIG_ARMV7_PSCI_NR_CPUS      2
-#define CONFIG_NAND_SUNXI_GPC_PORTS    {16, 17, 18}
-#elif defined(CONFIG_MACH_SUN8I_A33)
-#define CONFIG_ARMV7_PSCI_NR_CPUS      4
-#define CONFIG_NAND_SUNXI_GPC_PORTS    {16}
+#ifdef CONFIG_MACH_SUN8I_H3
+       #define CONFIG_SUNXI_USB_PHYS   4
+#elif defined CONFIG_MACH_SUN8I_A83T
+       #define CONFIG_SUNXI_USB_PHYS   3
+#elif defined CONFIG_MACH_SUN8I_V3S
+       #define CONFIG_SUNXI_USB_PHYS   1
 #else
-#error Unsupported sun8i variant
+       #define CONFIG_SUNXI_USB_PHYS   2
 #endif
-#define CONFIG_TIMER_CLK_FREQ          24000000
 
 /*
  * Include common sunxi configuration where most the settings are