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

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