Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 708ce2d..a88aecc 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += \
        kirkwood-ns2lite.dtb \
        kirkwood-ns2max.dtb \
        kirkwood-ns2mini.dtb \
+       kirkwood-nsa310s.dtb \
        kirkwood-openrd-base.dtb \
        kirkwood-openrd-client.dtb \
        kirkwood-openrd-ultimate.dtb \
@@ -157,30 +158,36 @@ dtb-$(CONFIG_ARCH_S5P4418) += \
        s5p4418-nanopi2.dtb
 
 dtb-$(CONFIG_ARCH_MESON) += \
+       meson-axg-s400.dtb \
+       meson-axg-jethome-jethub-j100.dtb \
        meson-gxbb-nanopi-k2.dtb \
        meson-gxbb-odroidc2.dtb \
        meson-gxbb-nanopi-k2.dtb \
        meson-gxbb-p200.dtb \
        meson-gxbb-p201.dtb \
-       meson-gxl-s905x-p212.dtb \
        meson-gxl-s805x-libretech-ac.dtb \
+       meson-gxl-s905d-libretech-pc.dtb \
+       meson-gxl-s905w-jethome-jethub-j80.dtb \
+       meson-gxl-s905x-khadas-vim.dtb \
        meson-gxl-s905x-libretech-cc.dtb \
        meson-gxl-s905x-libretech-cc-v2.dtb \
-       meson-gxl-s905x-khadas-vim.dtb \
-       meson-gxl-s905d-libretech-pc.dtb \
+       meson-gxl-s905x-p212.dtb \
        meson-gxm-khadas-vim2.dtb \
        meson-gxm-s912-libretech-pc.dtb \
        meson-gxm-wetek-core2.dtb \
-       meson-axg-s400.dtb \
-       meson-g12a-u200.dtb \
+       meson-g12a-radxa-zero.dtb \
        meson-g12a-sei510.dtb \
+       meson-g12a-u200.dtb \
+       meson-g12b-a311d-khadas-vim3.dtb \
        meson-g12b-gtking.dtb \
        meson-g12b-gtking-pro.dtb \
+       meson-g12b-gsking-x.dtb \
        meson-g12b-odroid-n2.dtb \
        meson-g12b-odroid-n2-plus.dtb \
-       meson-g12b-a311d-khadas-vim3.dtb \
+       meson-sm1-bananapi-m5.dtb \
        meson-sm1-khadas-vim3l.dtb \
        meson-sm1-odroid-c4.dtb \
+       meson-sm1-odroid-hc4.dtb \
        meson-sm1-sei610.dtb
 dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
@@ -365,6 +372,7 @@ dtb-$(CONFIG_AM33XX) += \
        am335x-pocketbeagle.dtb \
        am335x-pxm50.dtb \
        am335x-rut.dtb \
+       am335x-sancloud-bbe.dtb \
        am335x-shc.dtb \
        am335x-pdu001.dtb \
        am335x-chiliboard.dtb \
@@ -398,6 +406,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=                               \
        socfpga_cyclone5_socrates.dtb                   \
        socfpga_cyclone5_sr1500.dtb                     \
        socfpga_cyclone5_vining_fpga.dtb                \
+       socfpga_n5x_socdk.dtb                           \
        socfpga_stratix10_socdk.dtb
 
 dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb  \
@@ -629,6 +638,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
        sun50i-h5-libretech-all-h5-cc.dtb \
        sun50i-h5-nanopi-neo2.dtb \
        sun50i-h5-nanopi-neo-plus2.dtb \
+       sun50i-h5-nanopi-r1s-h5.dtb \
        sun50i-h5-orangepi-zero-plus.dtb \
        sun50i-h5-orangepi-pc2.dtb \
        sun50i-h5-orangepi-prime.dtb \
@@ -678,6 +688,7 @@ dtb-$(CONFIG_TARGET_MX23_OLINUXINO) += \
        imx23-olinuxino.dtb
 
 dtb-$(CONFIG_MX28) += \
+       imx28-evk.dtb \
        imx28-xea.dtb
 
 dtb-$(CONFIG_MX51) += \
@@ -811,11 +822,14 @@ dtb-$(CONFIG_MX6UL) += \
        imx6ul-liteboard.dtb \
        imx6ul-phytec-segin-ff-rdk-nand.dtb \
        imx6ul-pico-hobbit.dtb \
-       imx6ul-pico-pi.dtb
+       imx6ul-pico-pi.dtb \
+       imx6ul-kontron-n631x-s.dtb \
+       imx6ull-kontron-n641x-s.dtb
 
 dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
+       imx6ull-colibri-emmc.dtb \
        imx6ull-myir-mys-6ulx-eval.dtb \
        imx6ull-seeed-npi-imx6ull-dev-board.dtb \
        imx6ull-phytec-segin-ff-rdk-emmc.dtb \
@@ -859,14 +873,21 @@ dtb-$(CONFIG_ARCH_IMX8) += \
        imx8-deneb.dtb \
        imx8-giedi.dtb
 
+dtb-$(CONFIG_ARCH_IMX8ULP) += \
+       imx8ulp-evk.dtb
+
 dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mm-evk.dtb \
        imx8mm-icore-mx8mm-ctouch2.dtb \
        imx8mm-icore-mx8mm-edimm2.2.dtb \
+       imx8mm-kontron-n801x-s.dtb \
+       imx8mm-kontron-n801x-s-lvds.dtb \
        imx8mm-venice.dtb \
        imx8mm-venice-gw71xx-0x.dtb \
        imx8mm-venice-gw72xx-0x.dtb \
        imx8mm-venice-gw73xx-0x.dtb \
+       imx8mm-venice-gw7901.dtb \
+       imx8mm-venice-gw7902.dtb \
        imx8mm-verdin.dtb \
        phycore-imx8mm.dtb \
        imx8mn-ddr4-evk.dtb \
@@ -920,7 +941,7 @@ endif
 dtb-$(CONFIG_RZA1) += \
        r7s72100-gr-peach-u-boot.dtb
 
-dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
+dtb-$(CONFIG_ARCH_KEYSTONE) += keystone-k2hk-evm.dtb \
        keystone-k2l-evm.dtb \
        keystone-k2e-evm.dtb \
        keystone-k2g-evm.dtb \
@@ -1081,7 +1102,14 @@ dtb-$(CONFIG_STM32MP15x) += \
        stm32mp15xx-dhcom-picoitx.dtb \
        stm32mp15xx-dhcor-avenger96.dtb
 
-dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb
+dtb-$(CONFIG_SOC_K3_AM6) += \
+       k3-am654-base-board.dtb \
+       k3-am654-r5-base-board.dtb \
+       k3-am65-iot2050-spl.dtb \
+       k3-am6528-iot2050-basic.dtb \
+       k3-am6528-iot2050-basic-pg2.dtb \
+       k3-am6548-iot2050-advanced.dtb \
+       k3-am6548-iot2050-advanced-pg2.dtb
 dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \
                              k3-j721e-r5-common-proc-board.dtb \
                              k3-j7200-common-proc-board.dtb \
@@ -1111,6 +1139,8 @@ dtb-$(CONFIG_TARGET_GE_BX50V3) += \
 dtb-$(CONFIG_TARGET_GE_B1X5V2) += imx6dl-b1x5v2.dtb
 dtb-$(CONFIG_TARGET_MX53PPD) += imx53-ppd.dtb
 
+dtb-$(CONFIG_TARGET_VEXPRESS_CA9X4) += vexpress-v2p-ca9.dtb
+
 dtb-$(CONFIG_TARGET_TOTAL_COMPUTE) += total_compute.dtb
 
 dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb
@@ -1119,12 +1149,14 @@ dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb
 
 dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) += imx8mm-cl-iot-gate.dtb
 
+dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) += imx8mm-cl-iot-gate-optee.dtb
+
 dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb
 
 targets += $(dtb-y)
 
 # Add any required device tree compiler flags here
-DTC_FLAGS +=
+DTC_FLAGS += -a 0x8
 
 PHONY += dtbs
 dtbs: $(addprefix $(obj)/, $(dtb-y))