Unverified Commit 310b6637 authored Apr 29, 2022 by Arnd Bergmann

Merge tag 'tegra-for-5.18-arm-defconfig-fixes' of...

Merge tag 'tegra-for-5.18-arm-defconfig-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes

ARM: tegra: Default configuration fixes for v5.18

This contains two updates to the default configuration needed because of
a Kconfig symbol name change. This fixes a failure that was detected in
the NVIDIA automated test farm.

* tag 'tegra-for-5.18-arm-defconfig-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: config: multi v7: Enable NVIDIA Tegra video decoder driver
  ARM: tegra_defconfig: Update CONFIG_TEGRA_VDE option

Link: https://lore.kernel.org/r/20220429080626.494150-1-thierry.reding@gmail.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 73c7bcdc 39ad93d2

arch/arm/configs/multi_v7_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -673,6 +673,7 @@ CONFIG_VIDEO_STI_DELTA=m
		CONFIG_VIDEO_RENESAS_FDP1=m
		CONFIG_VIDEO_RENESAS_JPU=m
		CONFIG_VIDEO_RENESAS_VSP1=m
		CONFIG_VIDEO_TEGRA_VDE=m
		CONFIG_V4L_TEST_DRIVERS=y
		CONFIG_VIDEO_VIVID=m
		CONFIG_VIDEO_ADV7180=m

arch/arm/configs/tegra_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -286,7 +286,8 @@ CONFIG_SERIO_NVEC_PS2=y
		CONFIG_NVEC_POWER=y
		CONFIG_NVEC_PAZ00=y
		CONFIG_STAGING_MEDIA=y
		CONFIG_TEGRA_VDE=y
		CONFIG_V4L_MEM2MEM_DRIVERS=y
		CONFIG_VIDEO_TEGRA_VDE=y
		CONFIG_CHROME_PLATFORMS=y
		CONFIG_CROS_EC=y
		CONFIG_CROS_EC_I2C=m