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

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

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index d0191a3..87d269b 100644 (file)
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -11,22 +11,13 @@
 /*
  * A10 specific configuration
  */
-#define CONFIG_SUN4I           /* sun4i SoC generation */
 #define CONFIG_CLK_FULL_SPEED          1008000000
 
-#define CONFIG_SYS_PROMPT              "sun4i# "
 #define CONFIG_MACH_TYPE               4104
 
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_SUNXI
-
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#ifndef CONFIG_SUNXI_USB_VBUS0_GPIO
-#define CONFIG_SUNXI_USB_VBUS0_GPIO    SUNXI_GPH(6)
-#endif
-#ifndef CONFIG_SUNXI_USB_VBUS1_GPIO
-#define CONFIG_SUNXI_USB_VBUS1_GPIO    SUNXI_GPH(3)
-#endif
 #endif
 
 /*