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

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