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

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