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

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