Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze