diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mx25/defconfig | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_5.1.bb (renamed from recipes-kernel/linux/linux-fslc_5.0.bb) | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index cc0677b5..2d1159b0 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -312,7 +312,6 @@ CONFIG_USB=y | |||
312 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | 312 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y |
313 | CONFIG_USB_EHCI_HCD=y | 313 | CONFIG_USB_EHCI_HCD=y |
314 | CONFIG_USB_EHCI_MXC=y | 314 | CONFIG_USB_EHCI_MXC=y |
315 | CONFIG_USB_PRINTER=m | ||
316 | CONFIG_USB_STORAGE=y | 315 | CONFIG_USB_STORAGE=y |
317 | CONFIG_USB_CHIPIDEA=y | 316 | CONFIG_USB_CHIPIDEA=y |
318 | CONFIG_USB_CHIPIDEA_UDC=y | 317 | CONFIG_USB_CHIPIDEA_UDC=y |
@@ -320,7 +319,6 @@ CONFIG_USB_CHIPIDEA_HOST=y | |||
320 | CONFIG_USB_SERIAL=m | 319 | CONFIG_USB_SERIAL=m |
321 | CONFIG_USB_SERIAL_GENERIC=y | 320 | CONFIG_USB_SERIAL_GENERIC=y |
322 | CONFIG_USB_SERIAL_FTDI_SIO=m | 321 | CONFIG_USB_SERIAL_FTDI_SIO=m |
323 | CONFIG_USB_SERIAL_PL2303=m | ||
324 | CONFIG_USB_SERIAL_OPTION=m | 322 | CONFIG_USB_SERIAL_OPTION=m |
325 | CONFIG_USB_TEST=m | 323 | CONFIG_USB_TEST=m |
326 | CONFIG_USB_EHSET_TEST_FIXTURE=m | 324 | CONFIG_USB_EHSET_TEST_FIXTURE=m |
@@ -399,7 +397,7 @@ CONFIG_MAG3110=y | |||
399 | CONFIG_MPL3115=y | 397 | CONFIG_MPL3115=y |
400 | CONFIG_PWM=y | 398 | CONFIG_PWM=y |
401 | CONFIG_PWM_FSL_FTM=y | 399 | CONFIG_PWM_FSL_FTM=y |
402 | CONFIG_PWM_IMX=y | 400 | CONFIG_PWM_IMX27=y |
403 | CONFIG_NVMEM_IMX_OCOTP=y | 401 | CONFIG_NVMEM_IMX_OCOTP=y |
404 | CONFIG_NVMEM_VF610_OCOTP=y | 402 | CONFIG_NVMEM_VF610_OCOTP=y |
405 | CONFIG_TEE=y | 403 | CONFIG_TEE=y |
diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig index 8661dd9b..b37f8e67 100644 --- a/recipes-kernel/linux/linux-fslc/mx25/defconfig +++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig | |||
@@ -170,6 +170,9 @@ CONFIG_IMX_SDMA=y | |||
170 | # CONFIG_IOMMU_SUPPORT is not set | 170 | # CONFIG_IOMMU_SUPPORT is not set |
171 | CONFIG_IIO=y | 171 | CONFIG_IIO=y |
172 | CONFIG_FSL_MX25_ADC=y | 172 | CONFIG_FSL_MX25_ADC=y |
173 | CONFIG_PWM=y | ||
174 | CONFIG_PWM_IMX1=y | ||
175 | CONFIG_PWM_IMX27=y | ||
173 | CONFIG_EXT4_FS=y | 176 | CONFIG_EXT4_FS=y |
174 | # CONFIG_DNOTIFY is not set | 177 | # CONFIG_DNOTIFY is not set |
175 | CONFIG_VFAT_FS=y | 178 | CONFIG_VFAT_FS=y |
diff --git a/recipes-kernel/linux/linux-fslc_5.0.bb b/recipes-kernel/linux/linux-fslc_5.1.bb index 950f7808..1b74746f 100644 --- a/recipes-kernel/linux/linux-fslc_5.0.bb +++ b/recipes-kernel/linux/linux-fslc_5.1.bb | |||
@@ -11,9 +11,9 @@ include linux-fslc.inc | |||
11 | 11 | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
13 | 13 | ||
14 | PV = "5.0.5+git${SRCPV}" | 14 | PV = "5.1.12+git${SRCPV}" |
15 | 15 | ||
16 | SRCBRANCH = "5.0.x+fslc" | 16 | SRCBRANCH = "5.1.x+fslc" |
17 | SRCREV = "c7a0e482a175b632bfd5522bc6d5bfe7785ee9a9" | 17 | SRCREV = "111df67e3aa148d8b652ecf497ab1e54c8a13dfe" |
18 | 18 | ||
19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |