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

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