Skip to content

Commit 18c590e

Browse files
committed
arm64: defconfig: Enable Tegra HSP and BPMP
Selecting the IVC, HSP and BPMP drivers via Kconfig is problematic because it can create conflicting configurations. Instead, enable them in the default configuration. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Thierry Reding <[email protected]>
1 parent 19272b3 commit 18c590e

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
266266
CONFIG_QCOM_QSEECOM=y
267267
CONFIG_QCOM_QSEECOM_UEFISECAPP=y
268268
CONFIG_EXYNOS_ACPM_PROTOCOL=m
269+
CONFIG_TEGRA_BPMP=y
269270
CONFIG_GNSS=m
270271
CONFIG_GNSS_MTK_SERIAL=m
271272
CONFIG_MTD=y
@@ -1444,6 +1445,7 @@ CONFIG_PLATFORM_MHU=y
14441445
CONFIG_BCM2835_MBOX=y
14451446
CONFIG_QCOM_APCS_IPC=y
14461447
CONFIG_MTK_ADSP_MBOX=m
1448+
CONFIG_TEGRA_HSP_MBOX=y
14471449
CONFIG_QCOM_IPCC=y
14481450
CONFIG_ROCKCHIP_IOMMU=y
14491451
CONFIG_TEGRA_IOMMU_SMMU=y

drivers/soc/tegra/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ config ARCH_TEGRA_186_SOC
9797
bool "NVIDIA Tegra186 SoC"
9898
depends on !CPU_BIG_ENDIAN
9999
select MAILBOX
100-
select TEGRA_BPMP
101-
select TEGRA_HSP_MBOX
102-
select TEGRA_IVC
103100
select SOC_TEGRA_PMC
104101
help
105102
Enable support for the NVIDIA Tegar186 SoC. The Tegra186 features a
@@ -114,9 +111,6 @@ config ARCH_TEGRA_194_SOC
114111
depends on !CPU_BIG_ENDIAN
115112
select MAILBOX
116113
select PINCTRL_TEGRA194
117-
select TEGRA_BPMP
118-
select TEGRA_HSP_MBOX
119-
select TEGRA_IVC
120114
select SOC_TEGRA_PMC
121115
help
122116
Enable support for the NVIDIA Tegra194 SoC.
@@ -126,9 +120,6 @@ config ARCH_TEGRA_234_SOC
126120
depends on !CPU_BIG_ENDIAN
127121
select MAILBOX
128122
select PINCTRL_TEGRA234
129-
select TEGRA_BPMP
130-
select TEGRA_HSP_MBOX
131-
select TEGRA_IVC
132123
select SOC_TEGRA_PMC
133124
help
134125
Enable support for the NVIDIA Tegra234 SoC.

0 commit comments

Comments
 (0)