Merge with /home/tur/proj/fo300/u-boot