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

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