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

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