diff options
author | Tom Rini <trini@konsulko.com> | 2016-11-25 17:39:54 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-11-25 17:39:54 -0500 |
commit | ed77ccd014b4073c4d282028cfb22f8d1742fec1 (patch) | |
tree | 0d3cf0fd0e45bf10c7897a24f3560589f7740e20 /arch/arm/dts/Makefile | |
parent | 136179bec19f4bc84227cba138214ea392a723ea (diff) | |
parent | 020198b0c7d251cf6bde76024ecf0ee711860534 (diff) | |
download | u-boot-imx-ed77ccd014b4073c4d282028cfb22f8d1742fec1.zip u-boot-imx-ed77ccd014b4073c4d282028cfb22f8d1742fec1.tar.gz u-boot-imx-ed77ccd014b4073c4d282028cfb22f8d1742fec1.tar.bz2 |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/dts/Makefile')
-rw-r--r-- | arch/arm/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2c5b2f2..26f1e92 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -143,13 +143,15 @@ dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \ ls1021a-qds-lpuart.dtb \ - ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb + ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \ + ls1021a-iot-duart.dtb dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-rdb.dtb dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \ fsl-ls1043a-qds-lpuart.dtb \ fsl-ls1043a-rdb.dtb \ fsl-ls1046a-qds-duart.dtb \ + fsl-ls1046a-qds-lpuart.dtb \ fsl-ls1046a-rdb.dtb \ fsl-ls1012a-qds.dtb \ fsl-ls1012a-rdb.dtb \ |