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

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