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

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