ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE

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

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index fe8c511448b517d5a617ce30ba84c94c213d2a3c..b9a8731ee8b827868c050741303255c3cfdcaba2 100644 (file)
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -18,19 +18,26 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
-#define CONFIG_SUNXI_USB_PHYS  2
+#ifdef CONFIG_MACH_SUN8I_H3
+       #define CONFIG_SUNXI_USB_PHYS   4
+#elif defined CONFIG_MACH_SUN8I_A83T
+       #define CONFIG_SUNXI_USB_PHYS   3
+#else
+       #define CONFIG_SUNXI_USB_PHYS   2
+#endif
 
+#ifndef CONFIG_MACH_SUN8I_A83T
 #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}
+#elif defined(CONFIG_MACH_SUN8I_H3)
+#define CONFIG_ARMV7_PSCI_NR_CPUS      4
 #else
 #error Unsupported sun8i variant
 #endif
-#define CONFIG_TIMER_CLK_FREQ          24000000
+#endif
 
 /*
  * Include common sunxi configuration where most the settings are