Merge branch 'master' of git://git.denx.de/u-boot-sh

- More gen2/gen3 fixes