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

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