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

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