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

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