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

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