diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-28 11:12:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 11:12:03 -0400 |
| commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
| tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /configs/mx53ard_defconfig | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to 'configs/mx53ard_defconfig')
| -rw-r--r-- | configs/mx53ard_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig index 7a62c2b954..fe0f10619b 100644 --- a/configs/mx53ard_defconfig +++ b/configs/mx53ard_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_MX53ARD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg" +CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb" CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y |