diff options
| author | Valentin Schneider | 2019-04-16 19:02:21 +0200 |
|---|---|---|
| committer | Olof Johansson | 2019-04-29 08:19:50 +0200 |
| commit | 7b3320e6b1795d68b7e30eb3fad0860f2664aedd (patch) | |
| tree | 0dda7cc155a2da8d21790350852ee6b324925671 /arch/arm64/configs/defconfig | |
| parent | Merge tag 'multi-v7-defconfig-for-v5.2-signed' of git://git.kernel.org/pub/sc... (diff) | |
| download | kernel-qcow2-linux-7b3320e6b1795d68b7e30eb3fad0860f2664aedd.tar.gz kernel-qcow2-linux-7b3320e6b1795d68b7e30eb3fad0860f2664aedd.tar.xz kernel-qcow2-linux-7b3320e6b1795d68b7e30eb3fad0860f2664aedd.zip | |
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>
Diffstat (limited to 'arch/arm64/configs/defconfig')
| -rw-r--r-- | arch/arm64/configs/defconfig | 6 |
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 CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_HISI_SAS=y CONFIG_SCSI_HISI_SAS_PCI=y -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PLATFORM=m +CONFIG_SCSI_UFSHCD=y +CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFS_QCOM=m -CONFIG_SCSI_UFS_HISI=m +CONFIG_SCSI_UFS_HISI=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=y |