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

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