diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-03-10 16:44:23 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-03-22 19:27:39 +0000 |
commit | 4d1bcc052b7565235f1d66af459282089bfde2bf (patch) | |
tree | f995506cda5424d1af466b1bae4f0b89f7ec3b83 /recipes-kernel | |
parent | 46f180214c05c259323d0f4b18795dc045bfea9d (diff) | |
download | meta-freescale-4d1bcc052b7565235f1d66af459282089bfde2bf.tar.gz |
linux-fslc: Bump to c3825da143fc revision
This merges the 4.9.17 stable release and syncs the defconfig with
current version.
Change-Id: Ie2da831ef26817f6339e458860d1f64950f17e98
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 25 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_4.9.bb | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 5e0972c9..c92f5885 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -1,6 +1,5 @@ | |||
1 | CONFIG_KERNEL_LZO=y | 1 | CONFIG_KERNEL_LZO=y |
2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_FHANDLE=y | ||
4 | CONFIG_NO_HZ=y | 3 | CONFIG_NO_HZ=y |
5 | CONFIG_HIGH_RES_TIMERS=y | 4 | CONFIG_HIGH_RES_TIMERS=y |
6 | CONFIG_IKCONFIG=y | 5 | CONFIG_IKCONFIG=y |
@@ -72,7 +71,6 @@ CONFIG_IP_PNP_DHCP=y | |||
72 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 71 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
73 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 72 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
74 | # CONFIG_INET_XFRM_MODE_BEET is not set | 73 | # CONFIG_INET_XFRM_MODE_BEET is not set |
75 | # CONFIG_INET_LRO is not set | ||
76 | CONFIG_NETFILTER=y | 74 | CONFIG_NETFILTER=y |
77 | CONFIG_CAN=y | 75 | CONFIG_CAN=y |
78 | CONFIG_CAN_FLEXCAN=y | 76 | CONFIG_CAN_FLEXCAN=y |
@@ -154,7 +152,6 @@ CONFIG_WLCORE_SDIO=m | |||
154 | # CONFIG_WILINK_PLATFORM_DATA is not set | 152 | # CONFIG_WILINK_PLATFORM_DATA is not set |
155 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 153 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
156 | CONFIG_INPUT_EVDEV=y | 154 | CONFIG_INPUT_EVDEV=y |
157 | CONFIG_INPUT_EVBUG=m | ||
158 | CONFIG_KEYBOARD_GPIO=y | 155 | CONFIG_KEYBOARD_GPIO=y |
159 | CONFIG_KEYBOARD_SNVS_PWRKEY=y | 156 | CONFIG_KEYBOARD_SNVS_PWRKEY=y |
160 | CONFIG_KEYBOARD_IMX=y | 157 | CONFIG_KEYBOARD_IMX=y |
@@ -195,11 +192,11 @@ CONFIG_GPIO_SYSFS=y | |||
195 | CONFIG_GPIO_MC9S08DZ60=y | 192 | CONFIG_GPIO_MC9S08DZ60=y |
196 | CONFIG_GPIO_PCA953X=y | 193 | CONFIG_GPIO_PCA953X=y |
197 | CONFIG_GPIO_STMPE=y | 194 | CONFIG_GPIO_STMPE=y |
198 | CONFIG_POWER_SUPPLY=y | ||
199 | CONFIG_POWER_RESET=y | 195 | CONFIG_POWER_RESET=y |
200 | CONFIG_POWER_RESET_IMX=y | 196 | CONFIG_POWER_RESET_IMX=y |
201 | CONFIG_POWER_RESET_SYSCON=y | 197 | CONFIG_POWER_RESET_SYSCON=y |
202 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y | 198 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y |
199 | CONFIG_POWER_SUPPLY=y | ||
203 | CONFIG_SENSORS_GPIO_FAN=y | 200 | CONFIG_SENSORS_GPIO_FAN=y |
204 | CONFIG_SENSORS_IIO_HWMON=y | 201 | CONFIG_SENSORS_IIO_HWMON=y |
205 | CONFIG_THERMAL=y | 202 | CONFIG_THERMAL=y |
@@ -228,9 +225,8 @@ CONFIG_MEDIA_USB_SUPPORT=y | |||
228 | CONFIG_USB_VIDEO_CLASS=m | 225 | CONFIG_USB_VIDEO_CLASS=m |
229 | CONFIG_V4L_PLATFORM_DRIVERS=y | 226 | CONFIG_V4L_PLATFORM_DRIVERS=y |
230 | CONFIG_SOC_CAMERA=y | 227 | CONFIG_SOC_CAMERA=y |
231 | CONFIG_VIDEO_MX3=y | ||
232 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 228 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
233 | CONFIG_VIDEO_CODA=y | 229 | CONFIG_VIDEO_CODA=m |
234 | CONFIG_SOC_CAMERA_OV2640=y | 230 | CONFIG_SOC_CAMERA_OV2640=y |
235 | CONFIG_IMX_IPUV3_CORE=y | 231 | CONFIG_IMX_IPUV3_CORE=y |
236 | CONFIG_DRM=y | 232 | CONFIG_DRM=y |
@@ -241,6 +237,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | |||
241 | CONFIG_DRM_IMX_TVE=y | 237 | CONFIG_DRM_IMX_TVE=y |
242 | CONFIG_DRM_IMX_LDB=y | 238 | CONFIG_DRM_IMX_LDB=y |
243 | CONFIG_DRM_IMX_HDMI=y | 239 | CONFIG_DRM_IMX_HDMI=y |
240 | CONFIG_DRM_ETNAVIV=y | ||
244 | CONFIG_FB_MXS=y | 241 | CONFIG_FB_MXS=y |
245 | CONFIG_LCD_CLASS_DEVICE=y | 242 | CONFIG_LCD_CLASS_DEVICE=y |
246 | CONFIG_LCD_L4F00242T03=y | 243 | CONFIG_LCD_L4F00242T03=y |
@@ -264,6 +261,7 @@ CONFIG_SND_SOC_IMX_MC13783=y | |||
264 | CONFIG_SND_SOC_FSL_ASOC_CARD=y | 261 | CONFIG_SND_SOC_FSL_ASOC_CARD=y |
265 | CONFIG_SND_SOC_CS42XX8_I2C=y | 262 | CONFIG_SND_SOC_CS42XX8_I2C=y |
266 | CONFIG_SND_SOC_TLV320AIC3X=y | 263 | CONFIG_SND_SOC_TLV320AIC3X=y |
264 | CONFIG_SND_SOC_WM8960=y | ||
267 | CONFIG_SND_SIMPLE_CARD=y | 265 | CONFIG_SND_SIMPLE_CARD=y |
268 | CONFIG_USB=y | 266 | CONFIG_USB=y |
269 | CONFIG_USB_EHCI_HCD=y | 267 | CONFIG_USB_EHCI_HCD=y |
@@ -276,6 +274,7 @@ CONFIG_USB_SERIAL=m | |||
276 | CONFIG_USB_SERIAL_GENERIC=y | 274 | CONFIG_USB_SERIAL_GENERIC=y |
277 | CONFIG_USB_SERIAL_FTDI_SIO=m | 275 | CONFIG_USB_SERIAL_FTDI_SIO=m |
278 | CONFIG_USB_SERIAL_OPTION=m | 276 | CONFIG_USB_SERIAL_OPTION=m |
277 | CONFIG_USB_TEST=m | ||
279 | CONFIG_USB_EHSET_TEST_FIXTURE=m | 278 | CONFIG_USB_EHSET_TEST_FIXTURE=m |
280 | CONFIG_NOP_USB_XCEIV=y | 279 | CONFIG_NOP_USB_XCEIV=y |
281 | CONFIG_USB_MXS_PHY=y | 280 | CONFIG_USB_MXS_PHY=y |
@@ -293,7 +292,14 @@ CONFIG_USB_CONFIGFS_EEM=y | |||
293 | CONFIG_USB_CONFIGFS_MASS_STORAGE=y | 292 | CONFIG_USB_CONFIGFS_MASS_STORAGE=y |
294 | CONFIG_USB_CONFIGFS_F_LB_SS=y | 293 | CONFIG_USB_CONFIGFS_F_LB_SS=y |
295 | CONFIG_USB_CONFIGFS_F_FS=y | 294 | CONFIG_USB_CONFIGFS_F_FS=y |
295 | CONFIG_USB_CONFIGFS_F_UAC1=y | ||
296 | CONFIG_USB_CONFIGFS_F_UAC2=y | ||
297 | CONFIG_USB_CONFIGFS_F_MIDI=y | ||
298 | CONFIG_USB_CONFIGFS_F_HID=y | ||
299 | CONFIG_USB_CONFIGFS_F_UVC=y | ||
300 | CONFIG_USB_CONFIGFS_F_PRINTER=y | ||
296 | CONFIG_USB_ZERO=m | 301 | CONFIG_USB_ZERO=m |
302 | CONFIG_USB_AUDIO=m | ||
297 | CONFIG_USB_ETH=m | 303 | CONFIG_USB_ETH=m |
298 | CONFIG_USB_G_NCM=m | 304 | CONFIG_USB_G_NCM=m |
299 | CONFIG_USB_GADGETFS=m | 305 | CONFIG_USB_GADGETFS=m |
@@ -329,13 +335,12 @@ CONFIG_FSL_EDMA=y | |||
329 | CONFIG_IMX_SDMA=y | 335 | CONFIG_IMX_SDMA=y |
330 | CONFIG_MXS_DMA=y | 336 | CONFIG_MXS_DMA=y |
331 | CONFIG_STAGING=y | 337 | CONFIG_STAGING=y |
332 | # CONFIG_IOMMU_SUPPORT is not set | ||
333 | CONFIG_IIO=y | 338 | CONFIG_IIO=y |
334 | CONFIG_VF610_ADC=y | 339 | CONFIG_VF610_ADC=y |
340 | CONFIG_MPL3115=y | ||
335 | CONFIG_PWM=y | 341 | CONFIG_PWM=y |
336 | CONFIG_PWM_FSL_FTM=y | 342 | CONFIG_PWM_FSL_FTM=y |
337 | CONFIG_PWM_IMX=y | 343 | CONFIG_PWM_IMX=y |
338 | CONFIG_NVMEM=y | ||
339 | CONFIG_NVMEM_IMX_OCOTP=y | 344 | CONFIG_NVMEM_IMX_OCOTP=y |
340 | CONFIG_EXT2_FS=y | 345 | CONFIG_EXT2_FS=y |
341 | CONFIG_EXT2_FS_XATTR=y | 346 | CONFIG_EXT2_FS_XATTR=y |
@@ -355,7 +360,6 @@ CONFIG_ZISOFS=y | |||
355 | CONFIG_UDF_FS=m | 360 | CONFIG_UDF_FS=m |
356 | CONFIG_MSDOS_FS=m | 361 | CONFIG_MSDOS_FS=m |
357 | CONFIG_VFAT_FS=y | 362 | CONFIG_VFAT_FS=y |
358 | CONFIG_TMPFS=y | ||
359 | CONFIG_JFFS2_FS=y | 363 | CONFIG_JFFS2_FS=y |
360 | CONFIG_UBIFS_FS=y | 364 | CONFIG_UBIFS_FS=y |
361 | CONFIG_NFS_FS=y | 365 | CONFIG_NFS_FS=y |
@@ -369,13 +373,12 @@ CONFIG_NLS_ISO8859_1=y | |||
369 | CONFIG_NLS_ISO8859_15=m | 373 | CONFIG_NLS_ISO8859_15=m |
370 | CONFIG_NLS_UTF8=y | 374 | CONFIG_NLS_UTF8=y |
371 | CONFIG_PRINTK_TIME=y | 375 | CONFIG_PRINTK_TIME=y |
372 | CONFIG_DEBUG_FS=y | ||
373 | CONFIG_MAGIC_SYSRQ=y | 376 | CONFIG_MAGIC_SYSRQ=y |
374 | # CONFIG_SCHED_DEBUG is not set | 377 | # CONFIG_SCHED_DEBUG is not set |
375 | CONFIG_PROVE_LOCKING=y | 378 | CONFIG_PROVE_LOCKING=y |
376 | # CONFIG_DEBUG_BUGVERBOSE is not set | 379 | # CONFIG_DEBUG_BUGVERBOSE is not set |
377 | # CONFIG_ARM_UNWIND is not set | ||
378 | CONFIG_FUNCTION_TRACER=y | 380 | CONFIG_FUNCTION_TRACER=y |
381 | # CONFIG_ARM_UNWIND is not set | ||
379 | CONFIG_SECURITYFS=y | 382 | CONFIG_SECURITYFS=y |
380 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | 383 | CONFIG_CRYPTO_DEV_FSL_CAAM=y |
381 | CONFIG_CRYPTO_DEV_SAHARA=y | 384 | CONFIG_CRYPTO_DEV_SAHARA=y |
diff --git a/recipes-kernel/linux/linux-fslc_4.9.bb b/recipes-kernel/linux/linux-fslc_4.9.bb index c754fa4b..b07f0c32 100644 --- a/recipes-kernel/linux/linux-fslc_4.9.bb +++ b/recipes-kernel/linux/linux-fslc_4.9.bb | |||
@@ -12,6 +12,6 @@ include linux-fslc.inc | |||
12 | PV = "4.9+git${SRCPV}" | 12 | PV = "4.9+git${SRCPV}" |
13 | 13 | ||
14 | SRCBRANCH = "4.9.x+fslc" | 14 | SRCBRANCH = "4.9.x+fslc" |
15 | SRCREV = "3737a5f7223464efed3b0a9da2b045dae28d3a53" | 15 | SRCREV = "c3825da143fc419e2639e602f62d793ed0de4657" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)" | 17 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)" |