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

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