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

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