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

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