summaryrefslogtreecommitdiff
path: root/configs/dms-ba16_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-10-28 11:12:03 -0400
committerTom Rini <trini@konsulko.com>2016-10-28 11:12:03 -0400
commit4f892924d238cc415891dbea336a0fdaff2f853b (patch)
tree145882227f01a5092c656d1fc7122adff76bc8c2 /configs/dms-ba16_defconfig
parentec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff)
parent1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (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/dms-ba16_defconfig')
-rw-r--r--configs/dms-ba16_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index b40912b732..56dec74d13 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_ADVANTECH_DMS_BA16=y
CONFIG_VIDEO=y
+CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
CONFIG_BOOTDELAY=1
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y