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

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