diff --git a/recipes-kernel/linux/linux-toradex-4.0/defconfig b/recipes-kernel/linux/linux-toradex-4.1/defconfig similarity index 89% rename from recipes-kernel/linux/linux-toradex-4.0/defconfig rename to recipes-kernel/linux/linux-toradex-4.1/defconfig index ce119d8..a06fb87 100644 --- a/recipes-kernel/linux/linux-toradex-4.0/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1/defconfig @@ -4,8 +4,13 @@ CONFIG_FHANDLE=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y +CONFIG_NAMESPACES=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set @@ -65,14 +70,18 @@ CONFIG_NFT_MASQ_IPV4=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_NAT=y CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP6_NF_IPTABLES=y CONFIG_NF_TABLES_BRIDGE=y CONFIG_BRIDGE=y # CONFIG_BRIDGE_IGMP_SNOOPING is not set -CONFIG_CAN=y -CONFIG_CAN_FLEXCAN=y -CONFIG_CAN_MCP251X=y -CONFIG_CFG80211=y -CONFIG_MAC80211=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_CAN=m +CONFIG_CAN_FLEXCAN=m +CONFIG_CAN_MCP251X=m +CONFIG_CFG80211=m +CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_DEVTMPFS=y @@ -90,8 +99,6 @@ CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -117,6 +124,17 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_MICREL_PHY=y +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_USBNET=m +# CONFIG_USB_NET_CDC_NCM is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +CONFIG_USB_ZD1201=m +CONFIG_RT2X00=m +CONFIG_RT2800USB=m +# CONFIG_RT2800USB_RT35XX is not set +# CONFIG_RTL_CARDS is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -124,8 +142,7 @@ CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y # CONFIG_MOUSE_PS2 is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_EGALAX=y -CONFIG_TOUCHSCREEN_FUSION_F0710A=y +CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_TOUCHSCREEN_WM97XX=y # CONFIG_TOUCHSCREEN_WM9705 is not set # CONFIG_TOUCHSCREEN_WM9713 is not set @@ -149,7 +166,7 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_SYSCON=y -# CONFIG_HWMON is not set +CONFIG_SENSORS_IIO_HWMON=y CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_REGULATOR=y @@ -162,7 +179,7 @@ CONFIG_MEDIA_RC_SUPPORT=y # CONFIG_RC_MAP is not set # CONFIG_RC_DECODERS is not set CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=y +CONFIG_USB_VIDEO_CLASS=m # CONFIG_USB_GSPCA is not set CONFIG_FB=y CONFIG_FB_FSL_DCU=y @@ -184,8 +201,9 @@ CONFIG_SND=y # CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y -CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_FSL_SAI=y CONFIG_SND_SOC_FSL_SAI_WM9712=y +CONFIG_SND_IMX_SOC=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y @@ -196,6 +214,7 @@ CONFIG_USB_SERIAL=y CONFIG_USB_SERIAL_CONSOLE=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_PL2303=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y @@ -211,6 +230,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_ONESHOT=y @@ -229,17 +249,12 @@ CONFIG_IIO_TRIGGER=y CONFIG_VF610_ADC=y CONFIG_PWM=y CONFIG_PWM_FSL_FTM=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y +CONFIG_CUSE=y CONFIG_OVERLAY_FS=y CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y diff --git a/recipes-kernel/linux/linux-toradex_4.0.bb b/recipes-kernel/linux/linux-toradex_4.1.bb similarity index 75% rename from recipes-kernel/linux/linux-toradex_4.0.bb rename to recipes-kernel/linux/linux-toradex_4.1.bb index cd2f9d9..141cf35 100644 --- a/recipes-kernel/linux/linux-toradex_4.0.bb +++ b/recipes-kernel/linux/linux-toradex_4.1.bb @@ -6,8 +6,8 @@ SUMMARY = "Linux kernel for Toradex Colibri VFxx Computer on Modules" SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \ file://defconfig" -LOCALVERSION = "-v2.4b1.1" -SRCBRANCH = "toradex_vf_4.0" -SRCREV = "85f663301364d015738e9cc7c77bd8c550262df0" +LOCALVERSION = "-v2.5b1.1" +SRCBRANCH = "toradex_vf_4.1" +SRCREV = "326879dda277c0b85f64bf66e071745b63c0f658" DEPENDS += "lzop-native bc-native" COMPATIBLE_MACHINE = "(vf)"