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

- Assorted fixes

diff --cc configs/socfpga_arria5_defconfig
Simple merge

diff --cc configs/socfpga_cyclone5_defconfig
Simple merge

diff --cc configs/socfpga_de0_nano_soc_defconfig
Simple merge

diff --cc configs/socfpga_is1_defconfig
Simple merge

diff --cc configs/socfpga_mcvevk_defconfig
Simple merge

diff --cc configs/socfpga_sockit_defconfig
Simple merge

diff --cc configs/socfpga_socrates_defconfig
Simple merge

diff --cc configs/socfpga_sr1500_defconfig
Simple merge

diff --cc configs/socfpga_stratix10_defconfig
Simple merge