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

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

diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h
index 0625502..6c1eca4 100644 (file)
--- a/include/configs/sun6i.h
+++ b/include/configs/sun6i.h
@@ -17,13 +17,10 @@
 
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
 #define CONFIG_SUNXI_USB_PHYS  3
 
-#define CONFIG_ARMV7_PSCI              1
-#define CONFIG_ARMV7_PSCI_NR_CPUS      4
 #define CONFIG_ARMV7_SECURE_BASE       SUNXI_SRAM_B_BASE
 #define CONFIG_ARMV7_SECURE_MAX_SIZE    (64 * 1024) /* 64 KB */