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

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