Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...