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

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