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

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