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

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