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

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