Unverified Commit 0570e906 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.17-arm64-defconfig' of... 

Merge tag 'tegra-for-6.17-arm64-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/defconfig

arm64: tegra: Default configuration updates for v6.17-rc1

Enable the HSP and BPMP via the configuration instead of selecting them,
which can lead to problems. Also enable support for Tegra241, which was
never done after support for it was added, and Tegra264.

* tag 'tegra-for-6.17-arm64-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: defconfig: Enable Tegra241 and Tegra264
  arm64: defconfig: Enable Tegra HSP and BPMP

Link: https://lore.kernel.org/r/20250711220943.2389322-8-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents acbf491e bd3b8e53

arch/arm64/configs/defconfig

+4 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y 
CONFIG_QCOM_QSEECOM=y

CONFIG_QCOM_QSEECOM_UEFISECAPP=y

CONFIG_EXYNOS_ACPM_PROTOCOL=m

CONFIG_TEGRA_BPMP=y

CONFIG_GNSS=m

CONFIG_GNSS_MTK_SERIAL=m

CONFIG_MTD=y
@@ -1447,6 +1448,7 @@ CONFIG_PLATFORM_MHU=y 
CONFIG_BCM2835_MBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_MTK_ADSP_MBOX=m

CONFIG_TEGRA_HSP_MBOX=y

CONFIG_QCOM_IPCC=y

CONFIG_ROCKCHIP_IOMMU=y

CONFIG_TEGRA_IOMMU_SMMU=y
@@ -1505,6 +1507,8 @@ CONFIG_ARCH_TEGRA_210_SOC=y 
CONFIG_ARCH_TEGRA_186_SOC=y

CONFIG_ARCH_TEGRA_194_SOC=y

CONFIG_ARCH_TEGRA_234_SOC=y

CONFIG_ARCH_TEGRA_241_SOC=y

CONFIG_ARCH_TEGRA_264_SOC=y

CONFIG_TI_PRUSS=m

CONFIG_OWL_PM_DOMAINS=y

CONFIG_RASPBERRYPI_POWER=y

drivers/soc/tegra/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ config ARCH_TEGRA_186_SOC 
	bool "NVIDIA Tegra186 SoC"

	depends on !CPU_BIG_ENDIAN

	select MAILBOX

	select TEGRA_BPMP

	select TEGRA_HSP_MBOX

	select TEGRA_IVC

	select SOC_TEGRA_PMC

	help

	  Enable support for the NVIDIA Tegar186 SoC. The Tegra186 features a
@@ -114,9 +111,6 @@ config ARCH_TEGRA_194_SOC 
	depends on !CPU_BIG_ENDIAN

	select MAILBOX

	select PINCTRL_TEGRA194

	select TEGRA_BPMP

	select TEGRA_HSP_MBOX

	select TEGRA_IVC

	select SOC_TEGRA_PMC

	help

	  Enable support for the NVIDIA Tegra194 SoC.
@@ -126,9 +120,6 @@ config ARCH_TEGRA_234_SOC 
	depends on !CPU_BIG_ENDIAN

	select MAILBOX

	select PINCTRL_TEGRA234

	select TEGRA_BPMP

	select TEGRA_HSP_MBOX

	select TEGRA_IVC

	select SOC_TEGRA_PMC

	help

	  Enable support for the NVIDIA Tegra234 SoC.