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

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