Merge https://source.denx.de/u-boot/custodians/u-boot-x86

- Small fixes to eMMC and SDHCI for Intel Edison