Skip to content

Commit 6d34aab

Browse files
committed
Merge tag 'imx-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig changes for 6.5: - Remove KERNEL_LZO and FW_LOADER_USER_HELPER from imx_v6_v7_defconfig. - Enable i.MX8M video capture drivers and TI SN65DSI83 driver for arm64 defconfig. * tag 'imx-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable the TI SN65DSI83 driver ARM: imx_v6_v7_defconfig: Remove KERNEL_LZO config arm64: defconfig: Enable video capture drivers on imx8mm/imx8mn ARM: imx_v6_v7_defconfig: Remove firmware loader helper Link: https://lore.kernel.org/r/20230610072530.418847-4-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0403565 + 773887a commit 6d34aab

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_KERNEL_LZO=y
21
CONFIG_SYSVIPC=y
32
CONFIG_NO_HZ_IDLE=y
43
CONFIG_HIGH_RES_TIMERS=y
@@ -80,8 +79,6 @@ CONFIG_PCI_IMX6_HOST=y
8079
CONFIG_DEVTMPFS=y
8180
CONFIG_DEVTMPFS_MOUNT=y
8281
# CONFIG_STANDALONE is not set
83-
CONFIG_FW_LOADER_USER_HELPER=y
84-
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
8582
CONFIG_IMX_WEIM=y
8683
CONFIG_CONNECTOR=y
8784
CONFIG_MTD=y

arch/arm64/configs/defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,10 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
746746
CONFIG_V4L_MEM2MEM_DRIVERS=y
747747
CONFIG_VIDEO_MEDIATEK_JPEG=m
748748
CONFIG_VIDEO_MEDIATEK_VCODEC=m
749+
CONFIG_VIDEO_IMX7_CSI=m
750+
CONFIG_VIDEO_IMX_MIPI_CSIS=m
751+
CONFIG_VIDEO_IMX8_ISI=m
752+
CONFIG_VIDEO_IMX8_ISI_M2M=y
749753
CONFIG_VIDEO_QCOM_CAMSS=m
750754
CONFIG_VIDEO_QCOM_VENUS=m
751755
CONFIG_VIDEO_RCAR_ISP=m
@@ -814,6 +818,7 @@ CONFIG_DRM_SII902X=m
814818
CONFIG_DRM_SIMPLE_BRIDGE=m
815819
CONFIG_DRM_THINE_THC63LVD1024=m
816820
CONFIG_DRM_TI_TFP410=m
821+
CONFIG_DRM_TI_SN65DSI83=m
817822
CONFIG_DRM_TI_SN65DSI86=m
818823
CONFIG_DRM_ANALOGIX_ANX7625=m
819824
CONFIG_DRM_I2C_ADV7511=m

0 commit comments

Comments
 (0)