Merge tag 'versal-qspi-for-v2022.10' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h
index 5ce2cde..bc2e3a3 100644 (file)
--- a/include/configs/sun50i.h
+++ b/include/configs/sun50i.h
@@ -10,15 +10,13 @@
  * A64 specific configuration
  */
 
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#endif
-
-#define CONFIG_SUNXI_USB_PHYS  1
-
+#ifndef CONFIG_SUN50I_GEN_H6
 #define GICD_BASE              0x1c81000
 #define GICC_BASE              0x1c82000
+#else
+#define GICD_BASE              0x3021000
+#define GICC_BASE              0x3022000
+#endif
 
 /*
  * Include common sunxi configuration where most the settings are