Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd