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

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