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

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