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

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