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

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