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

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