Merge with /home/stefan/git/u-boot/yucca-ddr2