Merge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv