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

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