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 https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
sun4i.h
diff --git
a/include/configs/sun4i.h
b/include/configs/sun4i.h
index
87d269b
..
6033760
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
/*
* (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
*/
#ifndef __CONFIG_H
#define __CONFIG_H
@@
-11,18
+10,12
@@
/*
* A10 specific configuration
*/
/*
* A10 specific configuration
*/
-#define CONFIG_CLK_FULL_SPEED 1008000000
-
-#define CONFIG_MACH_TYPE 4104
-
-#ifdef CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#endif
/*
* Include common sunxi configuration where most the settings are
*/
#include <configs/sunxi-common.h>
/*
* 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 */
#endif /* __CONFIG_H */