diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-08-09 16:48:34 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-08-09 16:48:34 +0200 |
commit | 1899fac925eda817e12234aef3d01d354788662e (patch) | |
tree | baed464b3d9250361cd85e931a16d87b397cc36f /include/configs/sun7i.h | |
parent | e76b933e02e1b38e48754c435e9dba1c0deeb3c6 (diff) | |
parent | 3340eab26d89176dd0bf543e6d2590665c577423 (diff) | |
download | u-boot-imx-1899fac925eda817e12234aef3d01d354788662e.zip u-boot-imx-1899fac925eda817e12234aef3d01d354788662e.tar.gz u-boot-imx-1899fac925eda817e12234aef3d01d354788662e.tar.bz2 |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/sun7i.h')
-rw-r--r-- | include/configs/sun7i.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index d9be104..a902b84 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -17,6 +17,25 @@ #define CONFIG_SYS_PROMPT "sun7i# " +#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_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 + /* * Include common sunxi configuration where most the settings are */ |