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

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

diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h
index 93a1d96..95ccc35 100644 (file)
--- a/include/configs/sun6i.h
+++ b/include/configs/sun6i.h
@@ -14,9 +14,17 @@
 /*
  * A31 specific configuration
  */
-#define CONFIG_SUN6I           /* sun6i SoC generation */
 
-#define CONFIG_SYS_PROMPT              "sun6i# "
+#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
 
 /*
  * Include common sunxi configuration where most the settings are