summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-06 12:02:59 -0500
committerTom Rini <trini@ti.com>2015-02-06 12:02:59 -0500
commit5c123f5fbfa2f7ae43f08a0f92073e90330d704a (patch)
tree8f79c94d7a04301d3ef51b4bc10571acc7bc9706 /configs
parent4e79908044e4ebf186464cf118497458faf0903c (diff)
parent68102b81e8fb699087ec5757a75676c6c65af3fd (diff)
downloadtalos-obmc-uboot-5c123f5fbfa2f7ae43f08a0f92073e90330d704a.tar.gz
talos-obmc-uboot-5c123f5fbfa2f7ae43f08a0f92073e90330d704a.zip
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'configs')
-rw-r--r--configs/db-mv784mp-gp_defconfig5
-rw-r--r--configs/maxbcm_defconfig5
2 files changed, 6 insertions, 4 deletions
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 7aa216c47d..a7f13e2132 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -1,2 +1,3 @@
-CONFIG_ARM=y
-CONFIG_TARGET_DB_MV784MP_GP=y
+CONFIG_SPL=y
++S:CONFIG_ARM=y
++S:CONFIG_TARGET_DB_MV784MP_GP=y
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 4bcffd8c2d..219586a27d 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -1,2 +1,3 @@
-CONFIG_ARM=y
-CONFIG_TARGET_MAXBCM=y
+CONFIG_SPL=y
++S:CONFIG_ARM=y
++S:CONFIG_TARGET_MAXBCM=y
OpenPOWER on IntegriCloud