summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2019-05-06 23:39:20 -0700
committerYe Li <ye.li@nxp.com>2019-05-06 23:52:17 -0700
commit00e6fab7125fe407ab9fb1b852feafd45f0cdba3 (patch)
tree869e1fc83a05772ad2fdead80049338d8c310e0b /include
parent8fd681bb54956309fc2077a717d387f202241cf8 (diff)
MLK-21660 imx8qm: Disable SATA driver by default
The imx8 SATA driver will cause crash when some gen3 SATA device is connected. As there is no booting from SATA supported by ROM, so enabling this driver is not necessary, change to disable it at default. And will fix the issue in future. Users who need to use the driver, have to set "CONFIG_SATA_IMX=y" in defconfig to enable it. Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/imx8qm_arm2.h4
-rw-r--r--include/configs/imx8qm_mek.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index 03f08d4f3a..fdcaa96dc6 100644
--- a/include/configs/imx8qm_arm2.h
+++ b/include/configs/imx8qm_arm2.h
@@ -79,17 +79,17 @@
#define CONFIG_ENV_OVERWRITE
+#ifdef CONFIG_SATA_IMX
#define CONFIG_SCSI
#define CONFIG_SCSI_AHCI
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
#define CONFIG_CMD_SCSI
-#define CONFIG_LIBATA
#define CONFIG_SYS_SCSI_MAX_LUN 1
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * CONFIG_SYS_SCSI_MAX_LUN)
#define CONFIG_SYS_SCSI_MAXDEVICE CONFIG_SYS_SCSI_MAX_DEVICE
#define CONFIG_SYS_SATA_MAX_DEVICE 1
-#define CONFIG_SATA_IMX
+#endif
#define CONFIG_FSL_HSIO
#define CONFIG_PCIE_IMX8X
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 32f5cfc715..44d5660291 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -91,17 +91,17 @@
#define CONFIG_ENV_OVERWRITE
+#ifdef CONFIG_SATA_IMX
#define CONFIG_SCSI
#define CONFIG_SCSI_AHCI
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
#define CONFIG_CMD_SCSI
-#define CONFIG_LIBATA
#define CONFIG_SYS_SCSI_MAX_LUN 1
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * CONFIG_SYS_SCSI_MAX_LUN)
#define CONFIG_SYS_SCSI_MAXDEVICE CONFIG_SYS_SCSI_MAX_DEVICE
#define CONFIG_SYS_SATA_MAX_DEVICE 1
-#define CONFIG_SATA_IMX
+#endif
#define CONFIG_FSL_HSIO
#define CONFIG_PCIE_IMX8X