Merge with /home/mk/git/u-boot-usb-hacking#testing