diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
| commit | ec7483e34ea932fb68267dc0b1de30be51f271c9 (patch) | |
| tree | 6120e2d0923962ec16cc757a22454bc942c90af4 /configs/ls1046aqds_nand_defconfig | |
| parent | 07d778382200a05a8b86cc135f79ec48e386f25a (diff) | |
| parent | ec85721c8b94f9eb6807ebb15a223e4ec49a092a (diff) | |
| download | u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.tar.gz u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.tar.xz u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.zip | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1046aqds.h
include/configs/ls1046ardb.h
Diffstat (limited to 'configs/ls1046aqds_nand_defconfig')
| -rw-r--r-- | configs/ls1046aqds_nand_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig index da550fc6f2..802c69c0ad 100644 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y |