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

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