merge to: https://github.com/RobertCNelson/u-boot/commit/6ad77d88e57f6ab815ec7e85c5ac329054318c73

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