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

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