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

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