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

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