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

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