diff options
| author | Tom Rini <trini@ti.com> | 2014-11-13 10:35:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-13 10:35:13 -0500 |
| commit | 0d485b9095328cdc81b2ee94ff59b988c69b9127 (patch) | |
| tree | 93406f5dfe78b0b5670272a9de3f3eb3ee419785 /configs/A10s-OLinuXino-M_defconfig | |
| parent | 3ad207a2bf1399a689233a97978e306f71729f77 (diff) | |
| parent | 64a97599b79e277600bc6f1b22cf48aa04ee9bd0 (diff) | |
| download | u-boot-imx-0d485b9095328cdc81b2ee94ff59b988c69b9127.zip u-boot-imx-0d485b9095328cdc81b2ee94ff59b988c69b9127.tar.gz u-boot-imx-0d485b9095328cdc81b2ee94ff59b988c69b9127.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs/A10s-OLinuXino-M_defconfig')
| -rw-r--r-- | configs/A10s-OLinuXino-M_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index 6475675..94fafa6 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -1,7 +1,8 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)" +CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI" CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb" CONFIG_MMC_SUNXI_SLOT_EXTRA=1 +CONFIG_USB1_VBUS_PIN="PB10" +S:CONFIG_MMC0_CD_PIN="PG1" +S:CONFIG_MMC1_CD_PIN="PG13" +S:CONFIG_ARM=y |