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

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