merge to: https://github.com/RobertCNelson/u-boot/commit/58864ddc7276ca7403ddbb716da5853638f37519

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