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

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