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

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