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

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