Merge with /home/mk/git/u-boot#generic_ohci