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

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