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

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