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

arch/arm/Kconfig

arch/arm/dts/uniphier-common32.dtsi

arch/arm/dts/uniphier-ld11.dtsi

arch/arm/dts/uniphier-ld20.dtsi

arch/arm/dts/uniphier-ld4.dtsi

arch/arm/dts/uniphier-pro4-ref.dts

arch/arm/dts/uniphier-pro4.dtsi

arch/arm/dts/uniphier-pro5.dtsi

arch/arm/dts/uniphier-pxs2-gentil.dts

arch/arm/dts/uniphier-pxs2-vodka.dts

arch/arm/dts/uniphier-pxs2.dtsi

arch/arm/dts/uniphier-sld3.dtsi

arch/arm/dts/uniphier-sld8.dtsi

arch/arm/mach-uniphier/dram/umc-ld20.c

arch/arm/mach-uniphier/memconf/memconf.c

configs/uniphier_ld11_defconfig

configs/uniphier_ld20_defconfig

configs/uniphier_ld4_sld8_defconfig

configs/uniphier_pro4_defconfig

configs/uniphier_pxs2_ld6b_defconfig