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

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