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

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