Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit fa38c95

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm Arm64 defconfig updates for v6.11 This enables the newly introduce Shared Memory Bridge driver which improves the mechansim with which buffers are shared with TrustZone. It turns MSM8996, SM8150 and SM8350 interconnect providers to builtin, as debug UART now depends on these. The SM8350 GPU clock controller is enabled. The secure QFPROM driver is enabled, to provide access to OTP configuration for the LLCC driver on the QDU1000 platform. * tag 'qcom-arm64-defconfig-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: enable SHM Bridge support for the TZ memory allocator arm64: defconfig: Enable secure QFPROM driver arm64: defconfig: enable several Qualcomm interconnects arm64: defconfig: make CONFIG_INTERCONNECT_QCOM_SM8350 built-in arm64: defconfig: enable CONFIG_SM_GPUCC_8350 Link: https://lore.kernel.org/r/20240706155347.16207-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 31f62c5 + f5a2705 commit fa38c95

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

arch/arm64/configs/defconfig

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ CONFIG_GOOGLE_CBMEM=m
258258
CONFIG_GOOGLE_COREBOOT_TABLE=m
259259
CONFIG_EFI_CAPSULE_LOADER=y
260260
CONFIG_IMX_SCU=y
261+
CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
261262
CONFIG_QCOM_QSEECOM=y
262263
CONFIG_QCOM_QSEECOM_UEFISECAPP=y
263264
CONFIG_GNSS=m
@@ -1342,6 +1343,7 @@ CONFIG_SM_GCC_8650=y
13421343
CONFIG_SM_GPUCC_6115=m
13431344
CONFIG_SM_GPUCC_8150=y
13441345
CONFIG_SM_GPUCC_8250=y
1346+
CONFIG_SM_GPUCC_8350=m
13451347
CONFIG_SM_GPUCC_8450=m
13461348
CONFIG_SM_GPUCC_8550=m
13471349
CONFIG_SM_GPUCC_8650=m
@@ -1574,6 +1576,7 @@ CONFIG_NVMEM_LAYERSCAPE_SFP=m
15741576
CONFIG_NVMEM_MESON_EFUSE=m
15751577
CONFIG_NVMEM_MTK_EFUSE=y
15761578
CONFIG_NVMEM_QCOM_QFPROM=y
1579+
CONFIG_NVMEM_QCOM_SEC_QFPROM=m
15771580
CONFIG_NVMEM_RMEM=m
15781581
CONFIG_NVMEM_ROCKCHIP_EFUSE=y
15791582
CONFIG_NVMEM_ROCKCHIP_OTP=y
@@ -1603,7 +1606,7 @@ CONFIG_INTERCONNECT_IMX8MQ=m
16031606
CONFIG_INTERCONNECT_IMX8MP=y
16041607
CONFIG_INTERCONNECT_QCOM=y
16051608
CONFIG_INTERCONNECT_QCOM_MSM8916=m
1606-
CONFIG_INTERCONNECT_QCOM_MSM8996=m
1609+
CONFIG_INTERCONNECT_QCOM_MSM8996=y
16071610
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
16081611
CONFIG_INTERCONNECT_QCOM_QCM2290=y
16091612
CONFIG_INTERCONNECT_QCOM_QCS404=m
@@ -1616,9 +1619,9 @@ CONFIG_INTERCONNECT_QCOM_SC8280XP=y
16161619
CONFIG_INTERCONNECT_QCOM_SDM845=y
16171620
CONFIG_INTERCONNECT_QCOM_SDX75=y
16181621
CONFIG_INTERCONNECT_QCOM_SM6115=y
1619-
CONFIG_INTERCONNECT_QCOM_SM8150=m
1622+
CONFIG_INTERCONNECT_QCOM_SM8150=y
16201623
CONFIG_INTERCONNECT_QCOM_SM8250=y
1621-
CONFIG_INTERCONNECT_QCOM_SM8350=m
1624+
CONFIG_INTERCONNECT_QCOM_SM8350=y
16221625
CONFIG_INTERCONNECT_QCOM_SM8450=y
16231626
CONFIG_INTERCONNECT_QCOM_SM8550=y
16241627
CONFIG_INTERCONNECT_QCOM_SM8650=y

0 commit comments

Comments
 (0)