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 5611ecc..0e1baa9 100644 (file)
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
  *
  * Configuration settings for the Allwinner A10 (sun4i) CPU
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef __CONFIG_H
 #define __CONFIG_H
@@ -11,22 +10,6 @@
 /*
  * A10 specific configuration
  */
-#define CONFIG_SUN4I           /* sun4i SoC generation */
-#define CONFIG_CLK_FULL_SPEED          1008000000
-
-#define CONFIG_SYS_PROMPT              "sun4i# "
-
-#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
 
 /*
  * Include common sunxi configuration where most the settings are