Merge with /home/dzu/src/git/u-boot