Merge with http://opensource.freescale.com/pub/scm/u-boot-7448hpc2.git