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