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

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