Skip to content

Commit fec6111

Browse files
committed
Merge tag 'hisi-arm64-defconfig-for-5.8' of git://github.com/hisilicon/linux-hisi into arm/defconfig
ARM64: hisilicon: defconfig updates for 5.8 - Enable PCI PASID as built-in module and UACCE/SEC2/HPRE as loadable modules to support UACCE use case for the D06CS board * tag 'hisi-arm64-defconfig-for-5.8' of git://github.com/hisilicon/linux-hisi: arm64: defconfig: Enable UACCE/PCI PASID/SEC2/HPRE configs Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 93d2fa6 + 528443e commit fec6111

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ CONFIG_NET_9P_VIRTIO=y
189189
CONFIG_PCI=y
190190
CONFIG_PCIEPORTBUS=y
191191
CONFIG_PCI_IOV=y
192+
CONFIG_PCI_PASID=y
192193
CONFIG_HOTPLUG_PCI=y
193194
CONFIG_HOTPLUG_PCI_ACPI=y
194195
CONFIG_PCI_AARDVARK=y
@@ -242,6 +243,7 @@ CONFIG_BLK_DEV_NVME=m
242243
CONFIG_SRAM=y
243244
CONFIG_EEPROM_AT24=m
244245
CONFIG_EEPROM_AT25=m
246+
CONFIG_UACCE=m
245247
# CONFIG_SCSI_PROC_FS is not set
246248
CONFIG_BLK_DEV_SD=y
247249
CONFIG_SCSI_SAS_ATA=y
@@ -981,7 +983,9 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m
981983
CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
982984
CONFIG_CRYPTO_DEV_QCOM_RNG=m
983985
CONFIG_CRYPTO_DEV_CCREE=m
986+
CONFIG_CRYPTO_DEV_HISI_SEC2=m
984987
CONFIG_CRYPTO_DEV_HISI_ZIP=m
988+
CONFIG_CRYPTO_DEV_HISI_HPRE=m
985989
CONFIG_CMA_SIZE_MBYTES=32
986990
CONFIG_PRINTK_TIME=y
987991
CONFIG_DEBUG_INFO=y

0 commit comments

Comments
 (0)