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

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