Merge remote-tracking branch 'remotes/karo-txul/karo-txul' into karo-tx-linux

diff --combined arch/arm/boot/dts/Makefile
index 98a366f2d3e272d92e798fcdfc489fcb3c14fece,b7fc3019d13b84ca12ad15bcd198f95cc22da26a..873aefbd12151d983ebea356250c5ca508f4275d
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -383,17 -383,9 +383,17 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-ts4900.dtb \
        imx6dl-tx6dl-comtft.dtb \
        imx6dl-tx6s-8034.dtb \
 +      imx6dl-tx6s-8034-mb7.dtb \
        imx6dl-tx6s-8035.dtb \
 +      imx6dl-tx6s-8035-mb7.dtb \
 +      imx6dl-tx6s-8134.dtb \
 +      imx6dl-tx6s-8134-mb7.dtb \
 +      imx6dl-tx6s-8135.dtb \
 +      imx6dl-tx6s-8135-mb7.dtb \
        imx6dl-tx6u-801x.dtb \
 +      imx6dl-tx6u-80xx-mb7.dtb \
        imx6dl-tx6u-8033.dtb \
 +      imx6dl-tx6u-8033-mb7.dtb \
        imx6dl-tx6u-811x.dtb \
        imx6dl-tx6u-81xx-mb7.dtb \
        imx6dl-udoo.dtb \
@@@ -448,8 -440,6 +448,8 @@@
        imx6q-tx6q-1020.dtb \
        imx6q-tx6q-1020-comtft.dtb \
        imx6q-tx6q-1036.dtb \
 +      imx6q-tx6q-1036-mb7.dtb \
 +      imx6q-tx6q-10x0-mb7.dtb \
        imx6q-tx6q-1110.dtb \
        imx6q-tx6q-11x0-mb7.dtb \
        imx6q-udoo.dtb \
@@@ -461,10 -451,6 +461,10 @@@
        imx6qp-nitrogen6_som2.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb \
 +      imx6qp-tx6qp-8037.dtb \
 +      imx6qp-tx6qp-8037-mb7.dtb \
 +      imx6qp-tx6qp-8137.dtb \
 +      imx6qp-tx6qp-8137-mb7.dtb \
        imx6qp-zii-rdu2.dtb
  dtb-$(CONFIG_SOC_IMX6SL) += \
        imx6sl-evk.dtb \
@@@ -488,8 -474,14 +488,14 @@@ dtb-$(CONFIG_SOC_IMX6UL) += 
        imx6ul-pico-hobbit.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
-       imx6ul-tx6ul-mainboard.dtb \
-       imx6ull-14x14-evk.dtb
+       imx6ul-txul-5010-mainboard.dtb \
+       imx6ul-txul-5010-mb7.dtb \
+       imx6ul-txul-5011-mainboard.dtb \
+       imx6ul-txul-5011-mb7.dtb \
+       imx6ull-14x14-evk.dtb \
+       imx6ull-txul-8013.dtb \
+       imx6ull-txul-8013-mainboard.dtb \
+       imx6ull-txul-8013-mb7.dtb
  dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-eval-v3.dtb \