Merge with /server/home/stefan/git/u-boot/bamboo-sdram