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

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