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

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