Merge with /home/sr/git/u-boot/cfi-flash-fix