summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-03-10 16:44:23 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-03-22 19:30:40 +0000
commitfc804d29ee85d58e9bb66f7319e749b53e192457 (patch)
treefba399a714d9adb3e0c7d22d0805f0289d606847
parent406b1d6e45b4963d65b7c4c37f10dd4ea8fa305f (diff)
downloadmeta-freescale-fc804d29ee85d58e9bb66f7319e749b53e192457.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>
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig25
-rw-r--r--recipes-kernel/linux/linux-fslc_4.9.bb2
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 @@
1CONFIG_KERNEL_LZO=y 1CONFIG_KERNEL_LZO=y
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_FHANDLE=y
4CONFIG_NO_HZ=y 3CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y 4CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 5CONFIG_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
76CONFIG_NETFILTER=y 74CONFIG_NETFILTER=y
77CONFIG_CAN=y 75CONFIG_CAN=y
78CONFIG_CAN_FLEXCAN=y 76CONFIG_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
156CONFIG_INPUT_EVDEV=y 154CONFIG_INPUT_EVDEV=y
157CONFIG_INPUT_EVBUG=m
158CONFIG_KEYBOARD_GPIO=y 155CONFIG_KEYBOARD_GPIO=y
159CONFIG_KEYBOARD_SNVS_PWRKEY=y 156CONFIG_KEYBOARD_SNVS_PWRKEY=y
160CONFIG_KEYBOARD_IMX=y 157CONFIG_KEYBOARD_IMX=y
@@ -195,11 +192,11 @@ CONFIG_GPIO_SYSFS=y
195CONFIG_GPIO_MC9S08DZ60=y 192CONFIG_GPIO_MC9S08DZ60=y
196CONFIG_GPIO_PCA953X=y 193CONFIG_GPIO_PCA953X=y
197CONFIG_GPIO_STMPE=y 194CONFIG_GPIO_STMPE=y
198CONFIG_POWER_SUPPLY=y
199CONFIG_POWER_RESET=y 195CONFIG_POWER_RESET=y
200CONFIG_POWER_RESET_IMX=y 196CONFIG_POWER_RESET_IMX=y
201CONFIG_POWER_RESET_SYSCON=y 197CONFIG_POWER_RESET_SYSCON=y
202CONFIG_POWER_RESET_SYSCON_POWEROFF=y 198CONFIG_POWER_RESET_SYSCON_POWEROFF=y
199CONFIG_POWER_SUPPLY=y
203CONFIG_SENSORS_GPIO_FAN=y 200CONFIG_SENSORS_GPIO_FAN=y
204CONFIG_SENSORS_IIO_HWMON=y 201CONFIG_SENSORS_IIO_HWMON=y
205CONFIG_THERMAL=y 202CONFIG_THERMAL=y
@@ -228,9 +225,8 @@ CONFIG_MEDIA_USB_SUPPORT=y
228CONFIG_USB_VIDEO_CLASS=m 225CONFIG_USB_VIDEO_CLASS=m
229CONFIG_V4L_PLATFORM_DRIVERS=y 226CONFIG_V4L_PLATFORM_DRIVERS=y
230CONFIG_SOC_CAMERA=y 227CONFIG_SOC_CAMERA=y
231CONFIG_VIDEO_MX3=y
232CONFIG_V4L_MEM2MEM_DRIVERS=y 228CONFIG_V4L_MEM2MEM_DRIVERS=y
233CONFIG_VIDEO_CODA=y 229CONFIG_VIDEO_CODA=m
234CONFIG_SOC_CAMERA_OV2640=y 230CONFIG_SOC_CAMERA_OV2640=y
235CONFIG_IMX_IPUV3_CORE=y 231CONFIG_IMX_IPUV3_CORE=y
236CONFIG_DRM=y 232CONFIG_DRM=y
@@ -241,6 +237,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
241CONFIG_DRM_IMX_TVE=y 237CONFIG_DRM_IMX_TVE=y
242CONFIG_DRM_IMX_LDB=y 238CONFIG_DRM_IMX_LDB=y
243CONFIG_DRM_IMX_HDMI=y 239CONFIG_DRM_IMX_HDMI=y
240CONFIG_DRM_ETNAVIV=y
244CONFIG_FB_MXS=y 241CONFIG_FB_MXS=y
245CONFIG_LCD_CLASS_DEVICE=y 242CONFIG_LCD_CLASS_DEVICE=y
246CONFIG_LCD_L4F00242T03=y 243CONFIG_LCD_L4F00242T03=y
@@ -264,6 +261,7 @@ CONFIG_SND_SOC_IMX_MC13783=y
264CONFIG_SND_SOC_FSL_ASOC_CARD=y 261CONFIG_SND_SOC_FSL_ASOC_CARD=y
265CONFIG_SND_SOC_CS42XX8_I2C=y 262CONFIG_SND_SOC_CS42XX8_I2C=y
266CONFIG_SND_SOC_TLV320AIC3X=y 263CONFIG_SND_SOC_TLV320AIC3X=y
264CONFIG_SND_SOC_WM8960=y
267CONFIG_SND_SIMPLE_CARD=y 265CONFIG_SND_SIMPLE_CARD=y
268CONFIG_USB=y 266CONFIG_USB=y
269CONFIG_USB_EHCI_HCD=y 267CONFIG_USB_EHCI_HCD=y
@@ -276,6 +274,7 @@ CONFIG_USB_SERIAL=m
276CONFIG_USB_SERIAL_GENERIC=y 274CONFIG_USB_SERIAL_GENERIC=y
277CONFIG_USB_SERIAL_FTDI_SIO=m 275CONFIG_USB_SERIAL_FTDI_SIO=m
278CONFIG_USB_SERIAL_OPTION=m 276CONFIG_USB_SERIAL_OPTION=m
277CONFIG_USB_TEST=m
279CONFIG_USB_EHSET_TEST_FIXTURE=m 278CONFIG_USB_EHSET_TEST_FIXTURE=m
280CONFIG_NOP_USB_XCEIV=y 279CONFIG_NOP_USB_XCEIV=y
281CONFIG_USB_MXS_PHY=y 280CONFIG_USB_MXS_PHY=y
@@ -293,7 +292,14 @@ CONFIG_USB_CONFIGFS_EEM=y
293CONFIG_USB_CONFIGFS_MASS_STORAGE=y 292CONFIG_USB_CONFIGFS_MASS_STORAGE=y
294CONFIG_USB_CONFIGFS_F_LB_SS=y 293CONFIG_USB_CONFIGFS_F_LB_SS=y
295CONFIG_USB_CONFIGFS_F_FS=y 294CONFIG_USB_CONFIGFS_F_FS=y
295CONFIG_USB_CONFIGFS_F_UAC1=y
296CONFIG_USB_CONFIGFS_F_UAC2=y
297CONFIG_USB_CONFIGFS_F_MIDI=y
298CONFIG_USB_CONFIGFS_F_HID=y
299CONFIG_USB_CONFIGFS_F_UVC=y
300CONFIG_USB_CONFIGFS_F_PRINTER=y
296CONFIG_USB_ZERO=m 301CONFIG_USB_ZERO=m
302CONFIG_USB_AUDIO=m
297CONFIG_USB_ETH=m 303CONFIG_USB_ETH=m
298CONFIG_USB_G_NCM=m 304CONFIG_USB_G_NCM=m
299CONFIG_USB_GADGETFS=m 305CONFIG_USB_GADGETFS=m
@@ -329,13 +335,12 @@ CONFIG_FSL_EDMA=y
329CONFIG_IMX_SDMA=y 335CONFIG_IMX_SDMA=y
330CONFIG_MXS_DMA=y 336CONFIG_MXS_DMA=y
331CONFIG_STAGING=y 337CONFIG_STAGING=y
332# CONFIG_IOMMU_SUPPORT is not set
333CONFIG_IIO=y 338CONFIG_IIO=y
334CONFIG_VF610_ADC=y 339CONFIG_VF610_ADC=y
340CONFIG_MPL3115=y
335CONFIG_PWM=y 341CONFIG_PWM=y
336CONFIG_PWM_FSL_FTM=y 342CONFIG_PWM_FSL_FTM=y
337CONFIG_PWM_IMX=y 343CONFIG_PWM_IMX=y
338CONFIG_NVMEM=y
339CONFIG_NVMEM_IMX_OCOTP=y 344CONFIG_NVMEM_IMX_OCOTP=y
340CONFIG_EXT2_FS=y 345CONFIG_EXT2_FS=y
341CONFIG_EXT2_FS_XATTR=y 346CONFIG_EXT2_FS_XATTR=y
@@ -355,7 +360,6 @@ CONFIG_ZISOFS=y
355CONFIG_UDF_FS=m 360CONFIG_UDF_FS=m
356CONFIG_MSDOS_FS=m 361CONFIG_MSDOS_FS=m
357CONFIG_VFAT_FS=y 362CONFIG_VFAT_FS=y
358CONFIG_TMPFS=y
359CONFIG_JFFS2_FS=y 363CONFIG_JFFS2_FS=y
360CONFIG_UBIFS_FS=y 364CONFIG_UBIFS_FS=y
361CONFIG_NFS_FS=y 365CONFIG_NFS_FS=y
@@ -369,13 +373,12 @@ CONFIG_NLS_ISO8859_1=y
369CONFIG_NLS_ISO8859_15=m 373CONFIG_NLS_ISO8859_15=m
370CONFIG_NLS_UTF8=y 374CONFIG_NLS_UTF8=y
371CONFIG_PRINTK_TIME=y 375CONFIG_PRINTK_TIME=y
372CONFIG_DEBUG_FS=y
373CONFIG_MAGIC_SYSRQ=y 376CONFIG_MAGIC_SYSRQ=y
374# CONFIG_SCHED_DEBUG is not set 377# CONFIG_SCHED_DEBUG is not set
375CONFIG_PROVE_LOCKING=y 378CONFIG_PROVE_LOCKING=y
376# CONFIG_DEBUG_BUGVERBOSE is not set 379# CONFIG_DEBUG_BUGVERBOSE is not set
377# CONFIG_ARM_UNWIND is not set
378CONFIG_FUNCTION_TRACER=y 380CONFIG_FUNCTION_TRACER=y
381# CONFIG_ARM_UNWIND is not set
379CONFIG_SECURITYFS=y 382CONFIG_SECURITYFS=y
380CONFIG_CRYPTO_DEV_FSL_CAAM=y 383CONFIG_CRYPTO_DEV_FSL_CAAM=y
381CONFIG_CRYPTO_DEV_SAHARA=y 384CONFIG_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
12PV = "4.9+git${SRCPV}" 12PV = "4.9+git${SRCPV}"
13 13
14SRCBRANCH = "4.9.x+fslc" 14SRCBRANCH = "4.9.x+fslc"
15SRCREV = "3737a5f7223464efed3b0a9da2b045dae28d3a53" 15SRCREV = "c3825da143fc419e2639e602f62d793ed0de4657"
16 16
17COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)" 17COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)"