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

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