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

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