diff options
author | Tom Rini <trini@konsulko.com> | 2017-09-01 17:40:59 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-09-01 17:40:59 +0300 |
commit | 6aee2ab68c362ace5a59f89a63abed82e0bf19e5 (patch) | |
tree | 0b76045a178e9c0ed61e141bd8dfb3e34e4e86a9 /configs/imx6qdl_icore_mmc_defconfig | |
parent | 4109d702934c361b2ae2a5ad34f4dfee708cc214 (diff) | |
parent | 63af4b0ad0666e0797306593813b6272e1995bde (diff) | |
download | u-boot-6aee2ab68c362ace5a59f89a63abed82e0bf19e5.tar.xz |
Merge git://git.denx.de/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig
Diffstat (limited to 'configs/imx6qdl_icore_mmc_defconfig')
-rw-r--r-- | configs/imx6qdl_icore_mmc_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 2a0679f6ff..5a84c6366e 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -49,3 +49,4 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO_IPUV3=y +CONFIG_SPL_OS_BOOT=y |