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

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