merge to: https://github.com/RobertCNelson/u-boot/commit/785881f775252940185e10fbb2d5299c9ffa6bce

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