Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescale