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

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