/*
* A23 specific configuration
*/
-#define CONFIG_SUN8I /* sun8i SoC generation */
-#define CONFIG_SYS_PROMPT "sun8i# "
+
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_SUNXI
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+#endif
+
+#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
+#elif defined(CONFIG_MACH_SUN8I_A33)
+#define CONFIG_ARMV7_PSCI_NR_CPUS 4
+#elif defined(CONFIG_MACH_SUN8I_H3)
+#define CONFIG_ARMV7_PSCI_NR_CPUS 4
+#else
+#error Unsupported sun8i variant
+#endif
+#endif
/*
* Include common sunxi configuration where most the settings are