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

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