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

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