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

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