merge to: https://github.com/RobertCNelson/u-boot/commit/7bee1c91a94db19bd26f92cc67be35d3592c6429

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