For the record, upstream commit is https://source.denx.de/u-boot/u-boot/-/commit/94509b79b13e69c209199af0757afbde8d2ebd6d