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

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