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

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