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

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