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

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