Merge branch 'next-socfpga' of https://github.com/tienfong/uboot_mainline