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

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