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

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