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

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