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

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