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

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