Merge branch 'master' of git://git.denx.de/u-boot-atmel

[u-boot] / include / configs / sun7i.h

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index ccec50c328171d9fe4f11a1a1c3f67a287f52267..7fa7cec2441a4add5c3c27a857e99557ae834cc3 100644 (file)
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -12,10 +12,6 @@
 /*
  * A20 specific configuration
  */
-#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
@@ -24,12 +20,13 @@
 
 #define CONFIG_ARMV7_PSCI              1
 #define CONFIG_ARMV7_SECURE_BASE       SUNXI_SRAM_B_BASE
-#define CONFIG_SYS_CLK_FREQ            24000000
-#define CONFIG_TIMER_CLK_FREQ          CONFIG_SYS_CLK_FREQ
+#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 */