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

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