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

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