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

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