X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fsun7i.h;h=56101a9ffcd27532a81fb721476dbaf43e9519d9;hb=30748d81d0b33f04c86b5b96aab2e8bf8d330ea2;hp=966cbd8e83f6cb2659f64798cfeb502a1b5e6aa4;hpb=e71189168553ddf59f25132027d662458db8f3c5;p=u-boot

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index 966cbd8e83..56101a9ffc 100644
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -12,34 +12,23 @@
 /*
  * A20 specific configuration
  */
-#define CONFIG_SUN7I		/* sun7i SoC generation */
-#define CONFIG_CLK_FULL_SPEED		912000000
-
-#define CONFIG_SYS_PROMPT		"sun7i# "
-#define CONFIG_MACH_TYPE		4283
 
 #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
 
-#define CONFIG_ARMV7_VIRT		1
-#define CONFIG_ARMV7_NONSEC		1
+#define CONFIG_SUNXI_USB_PHYS	3
+
 #define CONFIG_ARMV7_PSCI		1
-#define CONFIG_ARMV7_PSCI_NR_CPUS	2
 #define CONFIG_ARMV7_SECURE_BASE	SUNXI_SRAM_B_BASE
-#define CONFIG_SYS_CLK_FREQ		24000000
+#define CONFIG_TIMER_CLK_FREQ		24000000
 
 /*
  * Include common sunxi configuration where most the settings are
  */
 #include <configs/sunxi-common.h>
 
+#define CONFIG_MACH_TYPE	(4283 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
+
 #endif /* __CONFIG_H */