merge to: https://github.com/RobertCNelson/u-boot/commit/63f7af9a4cfb4a3b9136674c6612c6d13957c2cd

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>