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

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