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

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