summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-10-20 21:59:40 -0400
committerTom Rini <trini@konsulko.com>2015-10-20 21:59:40 -0400
commite8d124fae0f3dff87348c989aa65ecf9b6eadc14 (patch)
treeff4f4709e54cde4d97349463c335d00f2d631e42 /configs
parentfd8133b725198978865ead730ff20d3991e05f20 (diff)
parent5b37212a3d78f546b5ef3f97a75155b3a0fd88cb (diff)
downloadtalos-obmc-uboot-e8d124fae0f3dff87348c989aa65ecf9b6eadc14.tar.gz
talos-obmc-uboot-e8d124fae0f3dff87348c989aa65ecf9b6eadc14.zip
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'configs')
-rw-r--r--configs/db-88f6820-gp_defconfig7
-rw-r--r--configs/db-mv784mp-gp_defconfig7
-rw-r--r--configs/maxbcm_defconfig2
3 files changed, 16 insertions, 0 deletions
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index e22f5f798e..6f612d9098 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -1,7 +1,14 @@
CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
CONFIG_TARGET_DB_88F6820_GP=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp"
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index c9859a8a5b..258e4d69e9 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -1,8 +1,15 @@
CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
CONFIG_TARGET_DB_MV784MP_GP=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NAND_PXA3XX=y
CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index b0b0d6c72c..d49def1bea 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -1,5 +1,7 @@
CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
CONFIG_TARGET_MAXBCM=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
OpenPOWER on IntegriCloud