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/dms-ba16-1g_defconfig | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
| download | u-boot-imx-4f892924d238cc415891dbea336a0fdaff2f853b.zip u-boot-imx-4f892924d238cc415891dbea336a0fdaff2f853b.tar.gz u-boot-imx-4f892924d238cc415891dbea336a0fdaff2f853b.tar.bz2 | |
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/dms-ba16-1g_defconfig')
| -rw-r--r-- | configs/dms-ba16-1g_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig index d63b290..c8251ff 100644 --- a/configs/dms-ba16-1g_defconfig +++ b/configs/dms-ba16-1g_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_ADVANTECH_DMS_BA16=y +CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb" CONFIG_SYS_DDR_1G=y CONFIG_VIDEO=y CONFIG_BOOTDELAY=1 |