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

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