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

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