summaryrefslogtreecommitdiff
path: root/configs/Colombus_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-13 10:35:13 -0500
committerTom Rini <trini@ti.com>2014-11-13 10:35:13 -0500
commit0d485b9095328cdc81b2ee94ff59b988c69b9127 (patch)
tree93406f5dfe78b0b5670272a9de3f3eb3ee419785 /configs/Colombus_defconfig
parent3ad207a2bf1399a689233a97978e306f71729f77 (diff)
parent64a97599b79e277600bc6f1b22cf48aa04ee9bd0 (diff)
downloadu-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/Colombus_defconfig')
-rw-r--r--configs/Colombus_defconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 89291f9..bef568d 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -1,5 +1,6 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN6I=y
-CONFIG_TARGET_COLOMBUS=y
+CONFIG_SPL=y
CONFIG_FDTFILE="sun6i-a31-colombus.dtb"
++S:CONFIG_ARM=y
++S:CONFIG_ARCH_SUNXI=y
++S:CONFIG_MACH_SUN6I=y
++S:CONFIG_TARGET_COLOMBUS=y