merge to: https://github.com/RobertCNelson/u-boot/commit/4d16f67e7ba1a69929b55852f1a274c457a0db27

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