summaryrefslogtreecommitdiff
path: root/configs/Cubieboard_defconfig
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-09 09:19:10 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-09 09:19:10 +0200
commita6bc0195dba895fa0e9facc718d17eb098695685 (patch)
treeb3e93d9948b17e4c924012684b0f2fecdf547176 /configs/Cubieboard_defconfig
parentb653516769160a7ba5bb4318c014535e063fdc0b (diff)
parentb86d54b2c38a4beb97d580d7d9c8c6a5e57fc510 (diff)
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'configs/Cubieboard_defconfig')
-rw-r--r--configs/Cubieboard_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 57bf045050..8c1ff9584e 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -1,5 +1,5 @@
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb"
+CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y