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