Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...