Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index bf1b740..a4c3fb6 100644 (file)
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -15,7 +15,6 @@
 
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
 #ifdef CONFIG_MACH_SUN8I_H3
@@ -26,20 +25,6 @@
        #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
  */