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

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