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

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