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

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