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

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