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

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