Merge https://source.denx.de/u-boot/custodians/u-boot-sh