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

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