Merge with http://www.jdl.com/software/u-boot-86xx.git