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

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