Merge branch 'u-boot' of /home/mkr/git/u-boot-tq-group into bugfix