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

https://github.com/RobertCNelson/u-boot/compare/88342103cccf73b39c764bfb1473e7bf29b52b88...f0c6e1c31b94f193047619b6adf67c2d792b659e
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>