X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fsun4i.h;h=6033760583a176fcc696d86aa6f2624e25a72d2b;hb=29d280c88a1ff331dce2d4c7a5aaf2402aa0fd8a;hp=e0ec52dcde7fb7c296c5a92acca7a5bc4ab062c4;hpb=d5325eff10922acb11c39efece6d5f24de5b1998;p=oweals%2Fu-boot.git

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index e0ec52dcde..6033760583 100644
--- 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,26 +10,12 @@
 /*
  * A10 specific configuration
  */
-#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
 
 /*
  * 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 */