aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Schneider <valentin.schneider@arm.com>2019-04-16 13:02:21 -0400
committerOlof Johansson <olof@lixom.net>2019-04-29 02:19:50 -0400
commit7b3320e6b1795d68b7e30eb3fad0860f2664aedd (patch)
tree0dda7cc155a2da8d21790350852ee6b324925671
parentc4456b7d6d69f805397d5f34d688d8254d47ec25 (diff)
arm64: defconfig: Update UFSHCD for Hi3660 soc
Commit 7ee7ef24d02d ("scsi: arm64: defconfig: enable configs for Hisilicon ufs") set 'CONFIG_SCSI_UFS_HISI=y', but the configs it depends on (CONFIG_SCSI_HFSHCD_PLATFORM && CONFIG_SCSI_UFSHCD) were left to being built as modules. Commit 1f4fa50dd48f ("arm64: defconfig: Regenerate for v4.20") "fixed" that by reverting to 'CONFIG_SCSI_UFS_HISI=m'. Thing is, if the rootfs is stored in the on-board flash (which is the "canonical" way of doing things), we either need these drivers to be built-in, or we need to fiddle with an initramfs to access that flash and eventually load the modules installed over there. The former is the easiest, do that. Signed-off-by: Valentin Schneider <valentin.schneider@arm.com> Reviewed-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/configs/defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index d697171974e0..a4a7acc5f8f4 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -215,10 +215,10 @@ CONFIG_BLK_DEV_SD=y
215CONFIG_SCSI_SAS_ATA=y 215CONFIG_SCSI_SAS_ATA=y
216CONFIG_SCSI_HISI_SAS=y 216CONFIG_SCSI_HISI_SAS=y
217CONFIG_SCSI_HISI_SAS_PCI=y 217CONFIG_SCSI_HISI_SAS_PCI=y
218CONFIG_SCSI_UFSHCD=m 218CONFIG_SCSI_UFSHCD=y
219CONFIG_SCSI_UFSHCD_PLATFORM=m 219CONFIG_SCSI_UFSHCD_PLATFORM=y
220CONFIG_SCSI_UFS_QCOM=m 220CONFIG_SCSI_UFS_QCOM=m
221CONFIG_SCSI_UFS_HISI=m 221CONFIG_SCSI_UFS_HISI=y
222CONFIG_ATA=y 222CONFIG_ATA=y
223CONFIG_SATA_AHCI=y 223CONFIG_SATA_AHCI=y
224CONFIG_SATA_AHCI_PLATFORM=y 224CONFIG_SATA_AHCI_PLATFORM=y