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

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