diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2017-12-16 13:02:34 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-04-02 10:23:05 -0300 |
commit | ec8375857e56efc1f70464eabde7c3e3cbdb60f8 (patch) | |
tree | cf41e0b08fa79a7593540636d0ca0956621e7c14 /recipes-kernel | |
parent | 1e66b88a17babf916a1c4d7fef4f5f006a9b4874 (diff) | |
download | meta-freescale-ec8375857e56efc1f70464eabde7c3e3cbdb60f8.tar.gz |
linux-fslc-imx: Update to 4.9-1.0.x GA based fork
This updates the kernel fork for the 4.9-1.0.x-imx branch, merges the
4.9.67 stable release on top of it and apply following changes:
- ARM: dts: imx6ull: include all needed definitions
- ASoC: sgtl5000: Allow LRCLK pad drive strength to be changed
- video: fbdev: mxsfb: honor native-mode
- video: mxsfb: simplify parsing
- dmaengine: Kconfig: Extend the dependency for MXS_DMA
- video: fbdev: mxsfb: fix pixelclock polarity
- video: mxsfb: add compile dependencies
- chipidea: make usb charger optional
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx/defconfig | 24 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_4.9-1.0.x.bb (renamed from recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb) | 6 |
2 files changed, 8 insertions, 22 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig index 061a1bde..f9e53a6a 100644 --- a/recipes-kernel/linux/linux-fslc-imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/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 |
@@ -31,7 +30,6 @@ CONFIG_SOC_IMX6SLL=y | |||
31 | CONFIG_SOC_VF610=y | 30 | CONFIG_SOC_VF610=y |
32 | # CONFIG_SWP_EMULATE is not set | 31 | # CONFIG_SWP_EMULATE is not set |
33 | CONFIG_SMP=y | 32 | CONFIG_SMP=y |
34 | CONFIG_HAVE_ARM_ARCH_TIMER=y | ||
35 | CONFIG_VMSPLIT_2G=y | 33 | CONFIG_VMSPLIT_2G=y |
36 | CONFIG_PREEMPT=y | 34 | CONFIG_PREEMPT=y |
37 | CONFIG_AEABI=y | 35 | CONFIG_AEABI=y |
@@ -42,8 +40,8 @@ CONFIG_CPU_FREQ=y | |||
42 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 40 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
43 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y | 41 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y |
44 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 42 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
45 | CONFIG_CPU_FREQ_GOV_INTERACTIVE=y | ||
46 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 43 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
44 | CONFIG_CPU_FREQ_GOV_INTERACTIVE=y | ||
47 | CONFIG_ARM_IMX6Q_CPUFREQ=y | 45 | CONFIG_ARM_IMX6Q_CPUFREQ=y |
48 | CONFIG_ARM_IMX7D_CPUFREQ=y | 46 | CONFIG_ARM_IMX7D_CPUFREQ=y |
49 | CONFIG_CPU_IDLE=y | 47 | CONFIG_CPU_IDLE=y |
@@ -61,8 +59,6 @@ CONFIG_IP_PNP_DHCP=y | |||
61 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 59 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
62 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 60 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
63 | # CONFIG_INET_XFRM_MODE_BEET is not set | 61 | # CONFIG_INET_XFRM_MODE_BEET is not set |
64 | # CONFIG_INET_LRO is not set | ||
65 | CONFIG_IPV6=y | ||
66 | CONFIG_VLAN_8021Q=y | 62 | CONFIG_VLAN_8021Q=y |
67 | CONFIG_LLC2=y | 63 | CONFIG_LLC2=y |
68 | CONFIG_CAN=y | 64 | CONFIG_CAN=y |
@@ -194,10 +190,10 @@ CONFIG_GPIO_SYSFS=y | |||
194 | CONFIG_GPIO_MAX732X=y | 190 | CONFIG_GPIO_MAX732X=y |
195 | CONFIG_GPIO_PCA953X=y | 191 | CONFIG_GPIO_PCA953X=y |
196 | CONFIG_GPIO_74X164=y | 192 | CONFIG_GPIO_74X164=y |
197 | CONFIG_POWER_SUPPLY=y | ||
198 | CONFIG_SABRESD_MAX8903=y | ||
199 | CONFIG_POWER_RESET=y | 193 | CONFIG_POWER_RESET=y |
200 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y | 194 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y |
195 | CONFIG_POWER_SUPPLY=y | ||
196 | CONFIG_SABRESD_MAX8903=y | ||
201 | CONFIG_SENSORS_MAX17135=y | 197 | CONFIG_SENSORS_MAX17135=y |
202 | CONFIG_SENSORS_MAG3110=y | 198 | CONFIG_SENSORS_MAG3110=y |
203 | CONFIG_THERMAL=y | 199 | CONFIG_THERMAL=y |
@@ -244,14 +240,12 @@ CONFIG_MXC_VADC=m | |||
244 | CONFIG_MXC_MIPI_CSI=m | 240 | CONFIG_MXC_MIPI_CSI=m |
245 | CONFIG_MXC_CAMERA_OV5647_MIPI=m | 241 | CONFIG_MXC_CAMERA_OV5647_MIPI=m |
246 | CONFIG_SOC_CAMERA=y | 242 | CONFIG_SOC_CAMERA=y |
247 | CONFIG_VIDEO_MX3=y | ||
248 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 243 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
249 | CONFIG_VIDEO_CODA=y | 244 | CONFIG_VIDEO_CODA=y |
250 | CONFIG_RADIO_SI476X=y | 245 | CONFIG_RADIO_SI476X=y |
251 | CONFIG_SOC_CAMERA_OV2640=y | 246 | CONFIG_SOC_CAMERA_OV2640=y |
252 | CONFIG_DRM=y | 247 | CONFIG_DRM=y |
253 | CONFIG_DRM_VIVANTE=y | 248 | CONFIG_DRM_VIVANTE=y |
254 | CONFIG_FB=y | ||
255 | CONFIG_FB_MXS=y | 249 | CONFIG_FB_MXS=y |
256 | CONFIG_FB_MXC_SYNC_PANEL=y | 250 | CONFIG_FB_MXC_SYNC_PANEL=y |
257 | CONFIG_FB_MXC_MIPI_DSI=y | 251 | CONFIG_FB_MXC_MIPI_DSI=y |
@@ -271,7 +265,6 @@ CONFIG_LCD_L4F00242T03=y | |||
271 | CONFIG_LCD_PLATFORM=y | 265 | CONFIG_LCD_PLATFORM=y |
272 | CONFIG_BACKLIGHT_PWM=y | 266 | CONFIG_BACKLIGHT_PWM=y |
273 | CONFIG_FRAMEBUFFER_CONSOLE=y | 267 | CONFIG_FRAMEBUFFER_CONSOLE=y |
274 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
275 | CONFIG_LOGO=y | 268 | CONFIG_LOGO=y |
276 | CONFIG_SOUND=y | 269 | CONFIG_SOUND=y |
277 | CONFIG_SND=y | 270 | CONFIG_SND=y |
@@ -293,7 +286,6 @@ CONFIG_SND_SOC_IMX_HDMI=y | |||
293 | CONFIG_SND_SIMPLE_CARD=y | 286 | CONFIG_SND_SIMPLE_CARD=y |
294 | CONFIG_USB=y | 287 | CONFIG_USB=y |
295 | CONFIG_USB_OTG_WHITELIST=y | 288 | CONFIG_USB_OTG_WHITELIST=y |
296 | CONFIG_USB_OTG_FSM=y | ||
297 | CONFIG_USB_EHCI_HCD=y | 289 | CONFIG_USB_EHCI_HCD=y |
298 | CONFIG_USB_EHCI_MXC=y | 290 | CONFIG_USB_EHCI_MXC=y |
299 | CONFIG_USB_HCD_TEST_MODE=y | 291 | CONFIG_USB_HCD_TEST_MODE=y |
@@ -353,10 +345,10 @@ CONFIG_RTC_DRV_MC13XXX=y | |||
353 | CONFIG_RTC_DRV_MXC=y | 345 | CONFIG_RTC_DRV_MXC=y |
354 | CONFIG_RTC_DRV_SNVS=y | 346 | CONFIG_RTC_DRV_SNVS=y |
355 | CONFIG_DMADEVICES=y | 347 | CONFIG_DMADEVICES=y |
356 | CONFIG_MXC_PXP_V2=y | ||
357 | CONFIG_MXC_PXP_V3=y | ||
358 | CONFIG_IMX_SDMA=y | 348 | CONFIG_IMX_SDMA=y |
359 | CONFIG_MXS_DMA=y | 349 | CONFIG_MXS_DMA=y |
350 | CONFIG_MXC_PXP_V2=y | ||
351 | CONFIG_MXC_PXP_V3=y | ||
360 | CONFIG_DMATEST=m | 352 | CONFIG_DMATEST=m |
361 | CONFIG_STAGING=y | 353 | CONFIG_STAGING=y |
362 | CONFIG_STAGING_MEDIA=y | 354 | CONFIG_STAGING_MEDIA=y |
@@ -373,9 +365,6 @@ CONFIG_EXT2_FS_SECURITY=y | |||
373 | CONFIG_EXT3_FS=y | 365 | CONFIG_EXT3_FS=y |
374 | CONFIG_EXT3_FS_POSIX_ACL=y | 366 | CONFIG_EXT3_FS_POSIX_ACL=y |
375 | CONFIG_EXT3_FS_SECURITY=y | 367 | CONFIG_EXT3_FS_SECURITY=y |
376 | CONFIG_EXT4_FS=y | ||
377 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
378 | CONFIG_EXT4_FS_SECURITY=y | ||
379 | CONFIG_QUOTA=y | 368 | CONFIG_QUOTA=y |
380 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 369 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
381 | # CONFIG_PRINT_QUOTA_WARNING is not set | 370 | # CONFIG_PRINT_QUOTA_WARNING is not set |
@@ -400,7 +389,6 @@ CONFIG_NLS_ASCII=y | |||
400 | CONFIG_NLS_ISO8859_1=y | 389 | CONFIG_NLS_ISO8859_1=y |
401 | CONFIG_NLS_ISO8859_15=m | 390 | CONFIG_NLS_ISO8859_15=m |
402 | CONFIG_NLS_UTF8=y | 391 | CONFIG_NLS_UTF8=y |
403 | CONFIG_DEBUG_FS=y | ||
404 | CONFIG_MAGIC_SYSRQ=y | 392 | CONFIG_MAGIC_SYSRQ=y |
405 | # CONFIG_SCHED_DEBUG is not set | 393 | # CONFIG_SCHED_DEBUG is not set |
406 | # CONFIG_DEBUG_BUGVERBOSE is not set | 394 | # CONFIG_DEBUG_BUGVERBOSE is not set |
@@ -423,9 +411,7 @@ CONFIG_CRYPTO_TGR192=y | |||
423 | CONFIG_CRYPTO_WP512=y | 411 | CONFIG_CRYPTO_WP512=y |
424 | CONFIG_CRYPTO_BLOWFISH=y | 412 | CONFIG_CRYPTO_BLOWFISH=y |
425 | CONFIG_CRYPTO_CAMELLIA=y | 413 | CONFIG_CRYPTO_CAMELLIA=y |
426 | CONFIG_CRYPTO_DES=y | ||
427 | CONFIG_CRYPTO_TWOFISH=y | 414 | CONFIG_CRYPTO_TWOFISH=y |
428 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
429 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | 415 | CONFIG_CRYPTO_DEV_FSL_CAAM=y |
430 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y | 416 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y |
431 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y | 417 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y |
diff --git a/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb b/recipes-kernel/linux/linux-fslc-imx_4.9-1.0.x.bb index f6709ed1..aff27bbf 100644 --- a/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb +++ b/recipes-kernel/linux/linux-fslc-imx_4.9-1.0.x.bb | |||
@@ -2,7 +2,7 @@ | |||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | 2 | # Released under the MIT license (see COPYING.MIT for the terms) |
3 | 3 | ||
4 | SUMMARY = "FSL Community BSP i.MX Linux kernel with backported features and fixes" | 4 | SUMMARY = "FSL Community BSP i.MX Linux kernel with backported features and fixes" |
5 | DESCRIPTION = "Linux kernel based on NXP 4.1.15-1.2.0 GA release, used by FSL Community BSP in order to \ | 5 | DESCRIPTION = "Linux kernel based on NXP 4.9.11-1.0.0 GA release, used by FSL Community BSP in order to \ |
6 | provide support for i.MX based platforms and include official Linux kernel stable updates, backported \ | 6 | provide support for i.MX based platforms and include official Linux kernel stable updates, backported \ |
7 | features and fixes coming from the vendors, kernel community or FSL Community itself." | 7 | features and fixes coming from the vendors, kernel community or FSL Community itself." |
8 | 8 | ||
@@ -10,7 +10,7 @@ include linux-fslc.inc | |||
10 | 10 | ||
11 | PV .= "+git${SRCPV}" | 11 | PV .= "+git${SRCPV}" |
12 | 12 | ||
13 | SRCBRANCH = "4.1-2.0.x-imx" | 13 | SRCBRANCH = "4.9-1.0.x-imx" |
14 | SRCREV = "6c1ad49339f46ff453d6f07be7d63fd495069bfe" | 14 | SRCREV = "953c6e30c9701fda69ef08e2476c541dc4fb1453" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE = "(mx6|mx7)" | 16 | COMPATIBLE_MACHINE = "(mx6|mx7)" |