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

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