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

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