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

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