summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2024-05-02 13:23:34 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2024-05-02 18:33:11 +0200
commit410ec6d70dcffa5fca050444f5b480573f9ee34a (patch)
tree50f1467d5bfa957e53e565c0613ece1389b716f5
parent7bae112aa53db9a1f2f02d333b9528ce97f09404 (diff)
linux-toradex-upstream-6.6: imx_v6_v7: refresh defconfig against 6.6.29
toradex_imx_v6_v7.config: Remove drivers added by: commit 27cc508d61d8 ("ARM: imx_v6_v7_defconfig: Enable Tarragon peripheral drivers") commit 91fa45bd8f8b ("ARM: imx_v6_v7_defconfig: Select CONFIG_DRM_I2C_NXP_TDA998X") commit 188224534f85 ("ARM: imx_v6_v7_defconfig: Enable the cyttsp5 touchscreen") commit 468e90a87272 ("ARM: imx_v6_v7_defconfig: Enable silergy,sy7636a") commit 9159025bea6e ("ARM: imx_v6_v7_defconfig: Enable rohm,bd71815") Refresh the defconfig per the instructions in the toradex_imx_v6_v7.config. This fixes PCIE which got broken by commit 75c2f26da03f ("PCI: imx6: Add i.MX PCIe EP mode support") DRM_DEBUG_MODESET_LOCK was enabled from PROVE_LOCKING in imx_v6_v7_defconfig FB_MX3 driver got deleted, not used on Toradex modules FRAMEBUFFER_CONSOLE is enabled by default KALLSYMS_ALL was enabled from PROVE_LOCKING in imx_v6_v7_defconfig SMC911X driver got deleted in favour of SMSC911X CONFIG_LEDS_TRIGGER_GPIO now considered broken R8188EU is replaced by enabled RTL8XXXU PRINT_QUOTA_WARNING is not selected by default AUTOFS4_FS replaced by AUTOFS_FS EXFAT_FS is now intentially enabled Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig16
-rw-r--r--recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config18
2 files changed, 23 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig b/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig
index 0bbb726..d2b8d0b 100644
--- a/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-upstream-6.6/defconfig
@@ -17,7 +17,6 @@ CONFIG_USER_NS=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
-CONFIG_KALLSYMS_ALL=y
CONFIG_PERF_EVENTS=y
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MXC=y
@@ -77,7 +76,7 @@ CONFIG_RFKILL_INPUT=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
# CONFIG_VGA_ARB is not set
-CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
@@ -123,9 +122,9 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROCHIP is not set
# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
# CONFIG_NET_VENDOR_SEEQ is not set
CONFIG_SMC91X=y
-CONFIG_SMC911X=y
CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
CONFIG_MICREL_PHY=y
@@ -226,7 +225,6 @@ CONFIG_VIDEO_TC358743=m
# CONFIG_CXD2880_SPI_DRV is not set
CONFIG_IMX_IPUV3_CORE=y
CONFIG_DRM=y
-CONFIG_DRM_DEBUG_MODESET_LOCK=y
CONFIG_DRM_PANEL_LVDS=y
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_PANEL_EDP=y
@@ -243,11 +241,9 @@ CONFIG_DRM_ETNAVIV=y
CONFIG_DRM_MXSFB=y
CONFIG_FB=y
CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_MX3 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_BACKLIGHT_GPIO=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
CONFIG_SOUND=y
CONFIG_SND=y
@@ -320,7 +316,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -333,7 +328,6 @@ CONFIG_IMX_SDMA=m
CONFIG_MXS_DMA=y
CONFIG_DMATEST=m
CONFIG_STAGING=y
-CONFIG_R8188EU=m
CONFIG_STAGING_MEDIA=y
CONFIG_VIDEO_IMX_MEDIA=y
CONFIG_COMMON_CLK_PWM=y
@@ -357,7 +351,6 @@ CONFIG_NVMEM_SNVS_LPGPR=y
CONFIG_TEE=y
CONFIG_OPTEE=y
CONFIG_MUX_MMIO=y
-CONFIG_EXFAT_FS=m
CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -368,8 +361,7 @@ CONFIG_EXT3_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
CONFIG_FUSE_FS=m
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
@@ -377,6 +369,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
+CONFIG_EXFAT_FS=m
CONFIG_NTFS3_FS=m
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_JFFS2_FS=m
@@ -401,6 +394,7 @@ CONFIG_CRYPTO_DEV_SAHARA=y
CONFIG_CRYPTO_DEV_MXS_DCP=y
CONFIG_CRC_CCITT=y
CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CMA_SIZE_MBYTES=256
diff --git a/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config b/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config
index c63dc9d..7ba0d3d 100644
--- a/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config
+++ b/recipes-kernel/linux/linux-toradex-upstream-6.6/toradex_imx_v6_v7.config
@@ -134,6 +134,7 @@ CONFIG_FB_MX3=n
CONFIG_RTC_DRV_MXC_V2=n
CONFIG_PWM_IMX_TPM=n
CONFIG_FSL_EDMA=n
+CONFIG_GPIO_VF610=n
# Disable not needed functionality
CONFIG_KEXEC=n
@@ -156,6 +157,7 @@ CONFIG_SERIO=n
CONFIG_PTP_1588_CLOCK_KVM=n
CONFIG_TOUCHSCREEN_ADS7846=n
+CONFIG_TOUCHSCREEN_CYTTSP5=n
CONFIG_TOUCHSCREEN_DA9052=n
CONFIG_TOUCHSCREEN_EGALAX=n
CONFIG_TOUCHSCREEN_GOODIX=n
@@ -167,6 +169,7 @@ CONFIG_TOUCHSCREEN_MC13783=n
CONFIG_TOUCHSCREEN_TSC2004=n
CONFIG_TOUCHSCREEN_TSC2007=n
CONFIG_TOUCHSCREEN_SX8654=n
+CONFIG_SENSORS_SY7636A=n
CONFIG_TOUCHSCREEN_COLIBRI_VF50=n
CONFIG_I2C_MUX=n
@@ -175,6 +178,7 @@ CONFIG_I2C_HELPER_AUTO=n
CONFIG_I2C_ALGOPCF=n
CONFIG_I2C_ALGOPCA=n
+CONFIG_GPIO_BD71815=n
CONFIG_GPIO_SIOX=n
CONFIG_GPIO_MAX732X=n
CONFIG_GPIO_PCA953X=n
@@ -182,24 +186,32 @@ CONFIG_GPIO_PCF857X=n
CONFIG_GPIO_STMPE=n
CONFIG_GPIO_74X164=n
+CONFIG_W1=n
+
CONFIG_RN5T618_POWER=n
CONFIG_SENSORS_MC13783_ADC=n
+CONFIG_SENSORS_PWM_FAN=n
+CONFIG_IIO_ST_ACCEL_3AXIS=n
CONFIG_DA9063_WATCHDOG=n
CONFIG_DA9062_WATCHDOG=n
+CONFIG_MFD_ROHM_BD71828=n
CONFIG_MFD_DA9052_I2C=n
CONFIG_MFD_DA9062=n
CONFIG_MFD_DA9063=n
CONFIG_MFD_MC13XXX_SPI=n
CONFIG_MFD_MC13XXX_I2C=n
+CONFIG_MFD_SY7636A=n
+CONFIG_REGULATOR_BD71815=n
CONFIG_REGULATOR_DA9052=n
CONFIG_REGULATOR_DA9062=n
CONFIG_REGULATOR_DA9063=n
CONFIG_REGULATOR_LTC3676=n
CONFIG_REGULATOR_MC13783=n
CONFIG_REGULATOR_MC13892=n
+CONFIG_REGULATOR_SY7636A=n
CONFIG_DVB_NET=n
@@ -211,6 +223,8 @@ CONFIG_VIDEO_TC358743=m
CONFIG_CXD2880_SPI_DRV=n
+CONFIG_DRM_I2C_NXP_TDA998X=n
+
# This compiles all media-related drivers as modules and disables TV stuff
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_IMX_MEDIA=y
@@ -239,6 +253,7 @@ CONFIG_SND_SOC_ES8328_SPI=n
CONFIG_HID_WACOM=n
CONFIG_I2C_HID_OF=n
+CONFIG_RTC_DRV_BD70528=n
CONFIG_RTC_DRV_ISL1208=n
CONFIG_RTC_DRV_PCF8523=n
CONFIG_RTC_DRV_PCF8563=n
@@ -248,6 +263,8 @@ CONFIG_RTC_DRV_RV3029C2=n
CONFIG_RTC_DRV_DA9063=n
CONFIG_RTC_DRV_MC13XXX=n
+CONFIG_COMMON_CLK_BD718XX=n
+
CONFIG_MMA8452=n
CONFIG_RN5T618_ADC=n
CONFIG_SENSORS_ISL29018=n
@@ -263,6 +280,7 @@ CONFIG_WLCORE=n
CONFIG_CS89x0_PLATFORM=n
+CONFIG_NET_VENDOR_QUALCOMM=n
CONFIG_AT803X_PHY=n
CONFIG_USB_RTL8152=m
CONFIG_USB_LAN78XX=m