projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
sun4i.h
diff --git
a/include/configs/sun4i.h
b/include/configs/sun4i.h
index
5611ecc
..
7cd5c69
100644
(file)
--- a/
include/configs/sun4i.h
+++ b/
include/configs/sun4i.h
@@
-11,21
+11,10
@@
/*
* A10 specific configuration
*/
/*
* 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
#ifdef CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_SUNXI
-
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#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
/*
#endif
/*
@@
-33,4
+22,6
@@
*/
#include <configs/sunxi-common.h>
*/
#include <configs/sunxi-common.h>
+#define CONFIG_MACH_TYPE (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
+
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */