Commit 3b837ba0 authored by Valentin Schneider's avatar Valentin Schneider Committed by Greg Kroah-Hartman

arm64: defconfig: Update UFSHCD for Hi3660 soc

[ Upstream commit 7b3320e6 ]

Commit 7ee7ef24 ("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 1f4fa50d ("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: default avatarValentin Schneider <valentin.schneider@arm.com>
Reviewed-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7bd4b91a
...@@ -222,10 +222,10 @@ CONFIG_BLK_DEV_SD=y ...@@ -222,10 +222,10 @@ CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_ATA=y
CONFIG_SCSI_HISI_SAS=y CONFIG_SCSI_HISI_SAS=y
CONFIG_SCSI_HISI_SAS_PCI=y CONFIG_SCSI_HISI_SAS_PCI=y
CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD=y
CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_UFSHCD_PLATFORM=y
CONFIG_SCSI_UFS_QCOM=m CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_UFS_HISI=m CONFIG_SCSI_UFS_HISI=y
CONFIG_ATA=y CONFIG_ATA=y
CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_AHCI_PLATFORM=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment