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

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