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

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