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

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