Skip to content

Commit 59abae1

Browse files
committed
Merge tag 'imx-defconfig-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.6: - Enable i.MX8MP clock driver in arm64 defconfig. - Enable Crypto CAAM driver support as module in arm64 defconfig. - Enable ILI210X touch driver, USB CDC ACM function, NFS_V4 support and TFP410 DVI bridge driver support in arm32 imx_v6_v7_defconfig. * tag 'imx-defconfig-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable CONFIG_CLK_IMX8MP by default arm64: defconfig: Enable CRYPTO_DEV_FSL_CAAM ARM: imx_v6_v7_defconfig: Select the TFP410 driver ARM: imx_v6_v7_defconfig: Enable NFS_V4_1 and NFS_V4_2 support ARM: configs: imx_v6_v7_defconfig: enable USB ACM ARM: imx_v6_v7_defconfig: Enable TOUCHSCREEN_ILI210X Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 7aeff9c + 9bfb129 commit 59abae1

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y
182182
CONFIG_TOUCHSCREEN_DA9052=y
183183
CONFIG_TOUCHSCREEN_EGALAX=y
184184
CONFIG_TOUCHSCREEN_GOODIX=y
185+
CONFIG_TOUCHSCREEN_ILI210X=y
185186
CONFIG_TOUCHSCREEN_MAX11801=y
186187
CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
187188
CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -282,6 +283,7 @@ CONFIG_DRM_MSM=y
282283
CONFIG_DRM_PANEL_LVDS=y
283284
CONFIG_DRM_PANEL_SIMPLE=y
284285
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
286+
CONFIG_DRM_TI_TFP410=y
285287
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
286288
CONFIG_DRM_DW_HDMI_CEC=y
287289
CONFIG_DRM_IMX=y
@@ -323,6 +325,7 @@ CONFIG_USB=y
323325
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
324326
CONFIG_USB_EHCI_HCD=y
325327
CONFIG_USB_EHCI_MXC=y
328+
CONFIG_USB_ACM=m
326329
CONFIG_USB_STORAGE=y
327330
CONFIG_USB_CHIPIDEA=y
328331
CONFIG_USB_CHIPIDEA_UDC=y
@@ -442,6 +445,8 @@ CONFIG_UBIFS_FS=y
442445
CONFIG_NFS_FS=y
443446
CONFIG_NFS_V3_ACL=y
444447
CONFIG_NFS_V4=y
448+
CONFIG_NFS_V4_1=y
449+
CONFIG_NFS_V4_2=y
445450
CONFIG_ROOT_NFS=y
446451
CONFIG_NLS_DEFAULT="cp437"
447452
CONFIG_NLS_CODEPAGE_437=y

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@ CONFIG_COMMON_CLK_PWM=y
695695
CONFIG_CLK_RASPBERRYPI=m
696696
CONFIG_CLK_IMX8MM=y
697697
CONFIG_CLK_IMX8MN=y
698+
CONFIG_CLK_IMX8MP=y
698699
CONFIG_CLK_IMX8MQ=y
699700
CONFIG_CLK_IMX8QXP=y
700701
CONFIG_TI_SCI_CLK=y
@@ -849,6 +850,7 @@ CONFIG_SECURITY=y
849850
CONFIG_CRYPTO_ECHAINIV=y
850851
CONFIG_CRYPTO_ANSI_CPRNG=y
851852
CONFIG_CRYPTO_DEV_SUN8I_CE=m
853+
CONFIG_CRYPTO_DEV_FSL_CAAM=m
852854
CONFIG_CRYPTO_DEV_HISI_ZIP=m
853855
CONFIG_CMA_SIZE_MBYTES=32
854856
CONFIG_PRINTK_TIME=y

0 commit comments

Comments
 (0)