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

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