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/tqma6_wru4.h | |
| 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 'include/configs/tqma6_wru4.h')
| -rw-r--r-- | include/configs/tqma6_wru4.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 3e88391890..96f15cda78 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_TQMA6_WRU4_H #define __CONFIG_TQMA6_WRU4_H -#define CONFIG_DEFAULT_FDT_FILE "imx6s-wru4.dtb" - /* DTT sensors */ #define CONFIG_DTT_SENSORS { 0, 1 } #define CONFIG_SYS_DTT_BUS_NUM 2 |