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

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