diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2019-06-05 17:32:28 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-06-21 18:16:27 -0300 |
commit | 0552378a5b1b32d70e09c550354d34b34a9595c5 (patch) | |
tree | ed7fa1b8183a857c9e441db45d1e6fd4d0f71ea2 /recipes-kernel/linux/linux-fslc/defconfig | |
parent | 6d9e595a27338ac7953950cf8957687b715ba34a (diff) | |
download | meta-freescale-0552378a5b1b32d70e09c550354d34b34a9595c5.tar.gz |
linux-fslc: Upgrade to version 5.1.x
This commit merges tag v5.1.12 into 5.1.x+fslc.
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux/linux-fslc/defconfig')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 4 |
1 files changed, 1 insertions, 3 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 |