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

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