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

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