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

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