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

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