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

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