This is not to be applied. It is needed to test using CONFIG_DM_MMC on x86 since SCSI is broken with this setup.
Signed-off-by: Simon Glass <s...@chromium.org> --- include/configs/x86-common.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index f7796cf63f..67f19d4121 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -30,7 +30,7 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* SATA AHCI storage */ - +#if 0 #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI #define CONFIG_LIBATA @@ -42,6 +42,7 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) #endif +#endif /* Generic TPM interfaced through LPC bus */ #define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000 @@ -82,8 +83,9 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_GETTIME +/* #define CONFIG_SCSI - +*/ #define CONFIG_CMD_ZBOOT #define CONFIG_BOOTARGS \ -- 2.12.2.715.g7642488e1d-goog _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot