merge to: https://github.com/RobertCNelson/u-boot/commit/5c9038b6af1a93410af966999638eabb81efcd0f

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