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

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