diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-12 08:29:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-12 08:29:42 -0400 |
| commit | 711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab (patch) | |
| tree | 4982ebe5c4ed6d1e28e110f17f2ca09e388d9ba1 /configs/ls1043aqds_defconfig | |
| parent | 8435179271106ec6fe9a9a5679b897755b1db8dd (diff) | |
| parent | 76379dfb7e7e5092f32c79897bb58c19979e576b (diff) | |
| download | u-boot-imx-711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab.zip u-boot-imx-711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab.tar.gz u-boot-imx-711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab.tar.bz2 | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h
Diffstat (limited to 'configs/ls1043aqds_defconfig')
| -rw-r--r-- | configs/ls1043aqds_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig index b209486..9352d82 100644 --- a/configs/ls1043aqds_defconfig +++ b/configs/ls1043aqds_defconfig @@ -4,7 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" +CONFIG_SYS_FSL_DDR4=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y @@ -29,4 +29,5 @@ CONFIG_DM_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y |