Merge tag 'v2021.10-rc5' into next

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

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index 63c84b1..0e1baa9 100644 (file)
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -11,17 +11,9 @@
  * A10 specific configuration
  */
 
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_SUNXI
-#endif
-
-#define CONFIG_SUNXI_USB_PHYS  3
-
 /*
  * Include common sunxi configuration where most the settings are
  */
 #include <configs/sunxi-common.h>
 
-#define CONFIG_MACH_TYPE       (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
-
 #endif /* __CONFIG_H */