]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge tag 'socfpga_dts_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 23:06:21 +0000 (00:06 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 23:06:21 +0000 (00:06 +0100)
Merge "SoCFPGA DTS update for v4.5" from Dinh Nguyen:

- Add DT board file for Denx MCVEVK board

* tag 'socfpga_dts_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: Add support for DENX MCV SoM and MCVEVK baseboard

1  2 
arch/arm/boot/dts/Makefile

index ceb3c559b78a3f20b57d1dd0f46ae582a509b3c4,17fb11b54b3338794fe1ab0f3d181ec3b34b16cf..840dec17a708f6cd14be451a12ddb33b8304b419
@@@ -75,10 -75,7 +75,10 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm4709-asus-rt-ac87u.dtb \
        bcm4709-buffalo-wxr-1900dhp.dtb \
        bcm4709-netgear-r7000.dtb \
 -      bcm4709-netgear-r8000.dtb
 +      bcm4709-netgear-r8000.dtb \
 +      bcm94708.dtb \
 +      bcm94709.dtb \
 +      bcm953012k.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
@@@ -462,15 -459,13 +462,15 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-bone.dtb \
        am335x-boneblack.dtb \
        am335x-bonegreen.dtb \
 -      am335x-sl50.dtb \
 +      am335x-chiliboard.dtb \
 +      am335x-cm-t335.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
 +      am335x-lxm.dtb \
        am335x-nano.dtb \
        am335x-pepper.dtb \
 -      am335x-lxm.dtb \
 -      am335x-chiliboard.dtb \
 +      am335x-shc.dtb \
 +      am335x-sl50.dtb \
        am335x-wega-rdk.dtb
  dtb-$(CONFIG_ARCH_OMAP4) += \
        omap4-duovero-parlor.dtb \
        omap4-var-stk-om44.dtb
  dtb-$(CONFIG_SOC_AM43XX) += \
        am43x-epos-evm.dtb \
 -      am437x-sk-evm.dtb \
 +      am437x-cm-t43.dtb \
 +      am437x-gp-evm.dtb \
        am437x-idk-evm.dtb \
 -      am437x-gp-evm.dtb
 +      am437x-sbc-t43.dtb \
 +      am437x-sk-evm.dtb
  dtb-$(CONFIG_SOC_OMAP5) += \
        omap5-cm-t54.dtb \
        omap5-igep0050.dtb \
        omap5-sbc-t54.dtb \
        omap5-uevm.dtb
  dtb-$(CONFIG_SOC_DRA7XX) += \
 -      dra7-evm.dtb \
        am57xx-beagle-x15.dtb \
 +      am57xx-cl-som-am57x.dtb \
 +      am57xx-sbc-am57x.dtb \
 +      dra7-evm.dtb \
        dra72-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += \
        orion5x-lacie-d2-network.dtb \
@@@ -519,10 -510,8 +519,10 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
  dtb-$(CONFIG_ARCH_REALVIEW) += \
 -      arm-realview-pb1176.dtb
 +      arm-realview-pb1176.dtb \
 +      arm-realview-pb11mp.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 +      rk3036-evb.dtb \
        rk3066a-bqcurie2.dtb \
        rk3066a-marsboard.dtb \
        rk3066a-rayeager.dtb \
        rk3288-popmetal.dtb \
        rk3288-r89.dtb \
        rk3288-rock2-square.dtb \
 +      rk3288-veyron-brain.dtb \
        rk3288-veyron-jaq.dtb \
        rk3288-veyron-jerry.dtb \
 +      rk3288-veyron-mickey.dtb \
        rk3288-veyron-minnie.dtb \
        rk3288-veyron-pinky.dtb \
        rk3288-veyron-speedy.dtb
@@@ -560,6 -547,7 +560,6 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += 
        r8a7778-bockw.dtb \
        r8a7779-marzen.dtb \
        r8a7790-lager.dtb \
 -      r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
        r8a7791-porter.dtb \
        r8a7793-gose.dtb \
  dtb-$(CONFIG_ARCH_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
        socfpga_arria10_socdk_sdmmc.dtb \
+       socfpga_cyclone5_mcvevk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_de0_sockit.dtb \
        socfpga_cyclone5_sockit.dtb \
@@@ -760,7 -749,6 +761,7 @@@ dtb-$(CONFIG_MACH_ARMADA_38X) += 
        armada-385-db-ap.dtb \
        armada-385-linksys-caiman.dtb \
        armada-385-linksys-cobra.dtb \
 +      armada-388-clearfog.dtb \
        armada-388-db.dtb \
        armada-388-gp.dtb \
        armada-388-rd.dtb