diff options
author | Tom Rini <trini@ti.com> | 2014-11-25 19:09:48 +0300 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-26 19:21:16 +0300 |
commit | f2ffe7da7fcc266f8c9cb557031066cfd5eb2a03 (patch) | |
tree | ea83bd3054c5360223d53cf79cc3088e90a52d5a /configs/Mele_M9_defconfig | |
parent | 1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51 (diff) | |
parent | b366fb92c3d118f97bb0f01fa9c40d253e70e12c (diff) | |
download | u-boot-f2ffe7da7fcc266f8c9cb557031066cfd5eb2a03.tar.xz |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs/Mele_M9_defconfig')
-rw-r--r-- | configs/Mele_M9_defconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index f46439fa4e..ac3cd36be8 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI" +CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31-m9.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y @@ -14,5 +14,7 @@ CONFIG_FDTFILE="sun6i-a31-m9.dtb" # HDMI power ? +S:CONFIG_AXP221_ALDO2_VOLT=1800 +S:CONFIG_AXP221_ALDO3_VOLT=3000 -# No Vbus gpio for usb1 -+S:CONFIG_USB1_VBUS_PIN="" +# Vbus gpio for usb1 ++S:CONFIG_USB1_VBUS_PIN="PC27" +# No Vbus gpio for usb2 ++S:CONFIG_USB2_VBUS_PIN="" |