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

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