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

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