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 /configs/Cubietruck_FEL_defconfig | |
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 'configs/Cubietruck_FEL_defconfig')
-rw-r--r-- | configs/Cubietruck_FEL_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig index b95c5fa..7ebf635 100644 --- a/configs/Cubietruck_FEL_defconfig +++ b/configs/Cubietruck_FEL_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII" +CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUN7I=y |