Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / arch / arm / dts / Makefile

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index ba96efa..43a2ee1 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -34,7 +34,7 @@ dtb-$(CONFIG_ARCH_DAVINCI) += \
        da850-lcdk.dtb \
        da850-lego-ev3.dtb
 
-dtb-$(CONFIG_KIRKWOOD) += \
+dtb-$(CONFIG_ARCH_KIRKWOOD) += \
        kirkwood-atl-sbx81lifkw.dtb \
        kirkwood-atl-sbx81lifxcat.dtb \
        kirkwood-blackarmor-nas220.dtb \
@@ -66,10 +66,13 @@ dtb-$(CONFIG_KIRKWOOD) += \
 
 dtb-$(CONFIG_MACH_S900) += \
        bubblegum_96.dtb
+dtb-$(CONFIG_MACH_S700) += \
+       s700-cubieboard7.dtb
 
 dtb-$(CONFIG_ROCKCHIP_PX30) += \
        px30-evb.dtb \
-       px30-firefly.dtb
+       px30-firefly.dtb \
+       rk3326-odroid-go2.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3036) += \
        rk3036-sdk.dtb
@@ -90,6 +93,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
        rk3288-phycore-rdk.dtb \
        rk3288-popmetal.dtb \
        rk3288-rock2-square.dtb \
+       rk3288-rock-pi-n8.dtb \
        rk3288-tinker.dtb \
        rk3288-tinker-s.dtb \
        rk3288-veyron-jerry.dtb \
@@ -104,7 +108,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
        rk3328-evb.dtb \
-       rk3328-rock64.dtb
+       rk3328-roc-cc.dtb \
+       rk3328-rock64.dtb \
+       rk3328-rock-pi-e.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3368) += \
        rk3368-lion.dtb \
@@ -123,20 +129,27 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
        rk3399-leez-p710.dtb \
        rk3399-nanopc-t4.dtb \
        rk3399-nanopi-m4.dtb \
+       rk3399-nanopi-m4-2gb.dtb \
        rk3399-nanopi-neo4.dtb \
        rk3399-orangepi.dtb \
-       rk3399-puma-ddr1333.dtb \
-       rk3399-puma-ddr1600.dtb \
-       rk3399-puma-ddr1866.dtb \
+       rk3399-pinebook-pro.dtb \
+       rk3399-puma-haikou.dtb \
        rk3399-roc-pc.dtb \
-       rk3399-rock-pi-4.dtb \
+       rk3399-roc-pc-mezzanine.dtb \
+       rk3399-rock-pi-4a.dtb \
+       rk3399-rock-pi-4b.dtb \
+       rk3399-rock-pi-4c.dtb \
        rk3399-rock960.dtb \
-       rk3399-rockpro64.dtb
+       rk3399-rockpro64.dtb \
+       rk3399pro-rock-pi-n10.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RV1108) += \
        rv1108-elgin-r1.dtb \
        rv1108-evb.dtb
 
+dtb-$(CONFIG_ARCH_S5P4418) += \
+       s5p4418-nanopi2.dtb
+
 dtb-$(CONFIG_ARCH_MESON) += \
        meson-gxbb-nanopi-k2.dtb \
        meson-gxbb-odroidc2.dtb \
@@ -156,8 +169,9 @@ dtb-$(CONFIG_ARCH_MESON) += \
        meson-g12b-odroid-n2.dtb \
        meson-g12b-a311d-khadas-vim3.dtb \
        meson-sm1-khadas-vim3l.dtb \
+       meson-sm1-odroid-c4.dtb \
        meson-sm1-sei610.dtb
-dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
+dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
        tegra20-plutux.dtb \
@@ -275,6 +289,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \
        zynqmp-mini-emmc1.dtb                   \
        zynqmp-mini-nand.dtb                    \
        zynqmp-mini-qspi.dtb                    \
+       zynqmp-topic-miamimp-xilinx-xdp-v1r1.dtb        \
        zynqmp-zcu100-revC.dtb                  \
        zynqmp-zcu102-revA.dtb                  \
        zynqmp-zcu102-revB.dtb                  \
@@ -369,15 +384,27 @@ dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \
        ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \
        ls1021a-iot-duart.dtb ls1021a-tsn.dtb
 dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
+       fsl-ls2080a-qds-42-x.dtb \
        fsl-ls2080a-rdb.dtb \
        fsl-ls2081a-rdb.dtb \
        fsl-ls2088a-rdb-qspi.dtb \
        fsl-ls1088a-rdb.dtb \
        fsl-ls1088a-qds.dtb \
+       fsl-ls1088a-qds-21-x.dtb \
+       fsl-ls1088a-qds-29-x.dtb \
        fsl-ls1028a-rdb.dtb \
-       fsl-ls1028a-qds.dtb \
+       fsl-ls1028a-qds-duart.dtb \
+       fsl-ls1028a-qds-lpuart.dtb \
        fsl-lx2160a-rdb.dtb \
-       fsl-lx2160a-qds.dtb
+       fsl-lx2160a-qds.dtb \
+       fsl-lx2160a-qds-3-x-x.dtb \
+       fsl-lx2160a-qds-3-11-x.dtb \
+       fsl-lx2160a-qds-7-x-x.dtb \
+       fsl-lx2160a-qds-7-11-x.dtb \
+       fsl-lx2160a-qds-19-x-x.dtb \
+       fsl-lx2160a-qds-19-11-x.dtb \
+       fsl-lx2160a-qds-20-x-x.dtb \
+       fsl-lx2160a-qds-20-11-x.dtb
 dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
        fsl-ls1043a-qds-lpuart.dtb \
        fsl-ls1043a-rdb.dtb \
@@ -657,6 +684,7 @@ dtb-y += \
        imx6q-nitrogen6x.dtb \
        imx6q-novena.dtb \
        imx6q-pico.dtb \
+       imx6q-phytec-mira-rdk-nand.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
@@ -693,6 +721,7 @@ dtb-$(CONFIG_MX6UL) += \
 dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
+       imx6ull-myir-mys-6ulx-eval.dtb \
        imx6ull-phytec-segin-ff-rdk-emmc.dtb \
        imx6ull-dart-6ul.dtb \
        imx6ull-somlabs-visionsom.dtb \
@@ -730,7 +759,10 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mm-verdin.dtb \
        imx8mn-ddr4-evk.dtb \
        imx8mq-evk.dtb \
-       imx8mp-evk.dtb
+       imx8mm-beacon-kit.dtb \
+       imx8mq-phanbell.dtb \
+       imx8mp-evk.dtb \
+       imx8mq-pico-pi.dtb
 
 dtb-$(CONFIG_ARCH_IMXRT) += imxrt1050-evk.dtb \
        imxrt1020-evk.dtb
@@ -746,17 +778,22 @@ dtb-$(CONFIG_RCAR_GEN2) += \
        r8a7794-silk-u-boot.dtb
 
 dtb-$(CONFIG_RCAR_GEN3) += \
-       r8a7795-h3ulcb-u-boot.dtb \
-       r8a7795-salvator-x-u-boot.dtb \
-       r8a7796-m3ulcb-u-boot.dtb \
-       r8a7796-salvator-x-u-boot.dtb \
-       r8a77965-m3nulcb-u-boot.dtb \
+       r8a774a1-beacon-rzg2m-kit.dtb \
+       r8a77950-ulcb-u-boot.dtb \
+       r8a77950-salvator-x-u-boot.dtb \
+       r8a77960-ulcb-u-boot.dtb \
+       r8a77960-salvator-x-u-boot.dtb \
+       r8a77965-ulcb-u-boot.dtb \
        r8a77965-salvator-x-u-boot.dtb \
        r8a77970-eagle-u-boot.dtb \
        r8a77980-condor-u-boot.dtb \
        r8a77990-ebisu-u-boot.dtb \
        r8a77995-draak-u-boot.dtb
 
+ifdef CONFIG_RCAR_GEN3
+DTC_FLAGS += -R 4 -p 0x1000
+endif
+
 dtb-$(CONFIG_RZA1) += \
        r7s72100-gr-peach-u-boot.dtb
 
@@ -824,6 +861,17 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
 dtb-$(CONFIG_TARGET_OMAP3_IGEP00X0) += \
        omap3-igep0020.dtb
 
+dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
+       omap4-panda.dtb \
+       omap4-panda-es.dtb
+
+dtb-$(CONFIG_TARGET_OMAP4_SDP4430) += \
+       omap4-sdp.dtb \
+       omap4-sdp-es23plus.dtb
+
+dtb-$(CONFIG_TARGET_OMAP5_UEVM) += \
+       omap5-uevm.dtb
+
 dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
        at91-sama5d2_ptc_ek.dtb
 
@@ -883,6 +931,8 @@ dtb-$(CONFIG_ARCH_BCM68360) += \
 dtb-$(CONFIG_ARCH_BCM6858) += \
        bcm968580xref.dtb
 
+dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb
+
 dtb-$(CONFIG_ARCH_ASPEED) += ast2500-evb.dtb
 
 dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
@@ -893,6 +943,8 @@ dtb-$(CONFIG_STM32MP15x) += \
        stm32mp157c-dk2.dtb \
        stm32mp157c-ed1.dtb \
        stm32mp157c-ev1.dtb \
+       stm32mp157c-odyssey.dtb \
+       stm32mp15xx-dhcom-drc02.dtb \
        stm32mp15xx-dhcom-pdk2.dtb \
        stm32mp15xx-dhcor-avenger96.dtb
 
@@ -902,6 +954,7 @@ dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \
 
 dtb-$(CONFIG_ARCH_MEDIATEK) += \
        mt7622-rfb.dtb \
+       mt7623a-unielec-u7623-02-emmc.dtb \
        mt7623n-bananapi-bpi-r2.dtb \
        mt7629-rfb.dtb \
        mt8512-bm1-emmc.dtb \