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

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