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

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