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

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