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

diff --cc configs/uniphier_ld11_defconfig
Simple merge

diff --cc configs/uniphier_ld20_defconfig
Simple merge

diff --cc configs/uniphier_ld4_sld8_defconfig
Simple merge

diff --cc configs/uniphier_pro4_defconfig
Simple merge

diff --cc configs/uniphier_pxs2_ld6b_defconfig
Simple merge

diff --cc configs/uniphier_sld3_defconfig
Simple merge

diff --cc include/configs/uniphier.h
Simple merge