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

diff --combined arch/arm/dts/Makefile
index 93ad6045baabbf2970b4130401500b3b84fa33d9,e6ee98e05c9d559a1213149e880c07de2bad22a0..e3633f5954e4436f584e9734ce8cb2742eaad2aa
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -138,7 -138,7 +138,7 @@@ dtb-$(CONFIG_ARCH_MVEBU) +=                        
        armada-388-clearfog.dtb                 \
        armada-388-gp.dtb                       \
        armada-388-helios4.dtb                  \
 -      armada-385-amc.dtb                      \
 +      armada-385-db-88f6820-amc.dtb           \
        armada-385-turris-omnia.dtb             \
        armada-7040-db.dtb                      \
        armada-7040-db-nand.dtb                 \
@@@ -151,8 -151,7 +151,8 @@@
        armada-xp-theadorable.dtb               \
        armada-38x-controlcenterdc.dtb          \
        armada-385-atl-x530.dtb                 \
 -      armada-385-atl-x530DP.dtb
 +      armada-385-atl-x530DP.dtb               \
 +      armada-xp-db-xc3-24g4xg.dtb
  
  dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
        uniphier-ld11-global.dtb \
@@@ -252,8 -251,7 +252,8 @@@ dtb-$(CONFIG_AM33XX) += 
        am335x-pdu001.dtb \
        am335x-chiliboard.dtb \
        am335x-sl50.dtb \
 -      am335x-base0033.dtb
 +      am335x-base0033.dtb \
 +      am335x-guardian.dtb
  dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb   \
        am43x-epos-evm.dtb \
        am437x-idk-evm.dtb \
@@@ -476,6 -474,7 +476,7 @@@ dtb-$(CONFIG_MACH_SUN50I) += 
        sun50i-a64-amarula-relic.dtb \
        sun50i-a64-bananapi-m64.dtb \
        sun50i-a64-nanopi-a64.dtb \
+       sun50i-a64-oceanic-5205-5inmfd.dtb \
        sun50i-a64-olinuxino.dtb \
        sun50i-a64-orangepi-win.dtb \
        sun50i-a64-pine64-lts.dtb \
@@@ -569,7 -568,6 +570,7 @@@ dtb-$(CONFIG_RCAR_GEN3) += 
        r8a7795-salvator-x-u-boot.dtb \
        r8a7796-m3ulcb-u-boot.dtb \
        r8a7796-salvator-x-u-boot.dtb \
 +      r8a77965-m3nulcb-u-boot.dtb \
        r8a77965-salvator-x-u-boot.dtb \
        r8a77970-eagle-u-boot.dtb \
        r8a77990-ebisu-u-boot.dtb \
@@@ -601,8 -599,6 +602,8 @@@ dtb-$(CONFIG_TARGET_AT91SAM9260EK) += 
  
  dtb-$(CONFIG_TARGET_AT91SAM9M10G45EK) += at91sam9m10g45ek.dtb
  
 +dtb-$(CONFIG_TARGET_PM9G45) += at91sam9m10g45ek.dtb
 +
  dtb-$(CONFIG_TARGET_AT91SAM9X5EK) += \
        at91sam9g15ek.dtb       \
        at91sam9g25ek.dtb       \
@@@ -612,9 -608,6 +613,9 @@@
  
  dtb-$(CONFIG_TARGET_AT91SAM9N12EK) += at91sam9n12ek.dtb
  
 +dtb-$(CONFIG_TARGET_GARDENA_SMART_GATEWAY_AT91SAM) += \
 +      at91sam9g25-gardena-smart-gateway.dtb
 +
  dtb-$(CONFIG_TARGET_ETHERNUT5) += ethernut5.dtb
  
  dtb-$(CONFIG_TARGET_USB_A9263) += usb_a9263.dtb