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

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