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

[u-boot] / include / configs / sun7i.h

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index 0dd29029b9b3368af216195c4deec8751d32104a..5455901efe3fcc2aaaf75c2885befa09fc8871f1 100644 (file)
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -15,13 +15,12 @@
 
 #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_SECURE_BASE       SUNXI_SRAM_B_BASE
+#define CONFIG_ARMV7_SECURE_MAX_SIZE   (64 * 1024) /* 64 KB */
 
 /*
  * Include common sunxi configuration where most the settings are