merge to: https://github.com/RobertCNelson/u-boot/commit/8854070784450f7ade382c5792b2721fbe27315a

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