merge to: https://github.com/RobertCNelson/u-boot/commit/61e76f53708cf082ef9061a140b57df3513b8ba1

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