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

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