diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 09:19:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 09:19:10 +0200 |
| commit | a6bc0195dba895fa0e9facc718d17eb098695685 (patch) | |
| tree | b3e93d9948b17e4c924012684b0f2fecdf547176 /configs/ba10_tv_box_defconfig | |
| parent | b653516769160a7ba5bb4318c014535e063fdc0b (diff) | |
| parent | b86d54b2c38a4beb97d580d7d9c8c6a5e57fc510 (diff) | |
| download | u-boot-imx-a6bc0195dba895fa0e9facc718d17eb098695685.zip u-boot-imx-a6bc0195dba895fa0e9facc718d17eb098695685.tar.gz u-boot-imx-a6bc0195dba895fa0e9facc718d17eb098695685.tar.bz2 | |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'configs/ba10_tv_box_defconfig')
| -rw-r--r-- | configs/ba10_tv_box_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig index c9961bd..6f64875 100644 --- a/configs/ba10_tv_box_defconfig +++ b/configs/ba10_tv_box_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)" -CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb" +CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)" +CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb" +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUN4I=y |