summaryrefslogtreecommitdiffstats
path: root/configs/ls1046aqds_nand_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-02-03 20:33:42 -0500
committerTom Rini <trini@konsulko.com>2017-02-03 20:33:42 -0500
commitc83a824e62277162ad35f52879b2316902c0eff5 (patch)
treefa91cdcda24b8822d0f1e52786b2657e4d68be27 /configs/ls1046aqds_nand_defconfig
parent0ff27d4a94637d4b1937c625d33212375bd118d9 (diff)
parentadd63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff)
downloadu-boot-c83a824e62277162ad35f52879b2316902c0eff5.tar.gz
u-boot-c83a824e62277162ad35f52879b2316902c0eff5.tar.xz
u-boot-c83a824e62277162ad35f52879b2316902c0eff5.zip
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/ls1046aqds_defconfig configs/ls1046aqds_nand_defconfig configs/ls1046aqds_qspi_defconfig configs/ls1046aqds_sdcard_ifc_defconfig configs/ls1046aqds_sdcard_qspi_defconfig configs/ls1046ardb_emmc_defconfig configs/ls1046ardb_qspi_defconfig configs/ls1046ardb_sdcard_defconfig
Diffstat (limited to 'configs/ls1046aqds_nand_defconfig')
-rw-r--r--configs/ls1046aqds_nand_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig
index 2864916bdd..57937b9a82 100644
--- a/configs/ls1046aqds_nand_defconfig
+++ b/configs/ls1046aqds_nand_defconfig
@@ -37,3 +37,5 @@ CONFIG_PCIE_LAYERSCAPE=y
CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y
CONFIG_FSL_DSPI=y
+CONFIG_USB=y
+CONFIG_DM_USB=y