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

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