Merge branch 'master-779h0-r2' of https://source.denx.de/u-boot/custodians/u-boot-sh