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

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