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 /include/configs/zc5601.h | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
| download | u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.tar.gz | |
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 'include/configs/zc5601.h')
| -rw-r--r-- | include/configs/zc5601.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h index 6ede668ea2..61c6a60b54 100644 --- a/include/configs/zc5601.h +++ b/include/configs/zc5601.h @@ -14,8 +14,6 @@ #define CONSOLE_DEV "ttymxc1" #define CONFIG_MMCROOT "/dev/mmcblk0p1" -#define CONFIG_DEFAULT_FDT_FILE "imx6q-zc5601.dtb" - #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #include "el6x_common.h" |