summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2017-12-16 13:02:34 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2018-04-02 10:23:05 -0300
commitec8375857e56efc1f70464eabde7c3e3cbdb60f8 (patch)
treecf41e0b08fa79a7593540636d0ca0956621e7c14 /recipes-kernel
parent1e66b88a17babf916a1c4d7fef4f5f006a9b4874 (diff)
downloadmeta-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/defconfig24
-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 @@
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
@@ -31,7 +30,6 @@ CONFIG_SOC_IMX6SLL=y
31CONFIG_SOC_VF610=y 30CONFIG_SOC_VF610=y
32# CONFIG_SWP_EMULATE is not set 31# CONFIG_SWP_EMULATE is not set
33CONFIG_SMP=y 32CONFIG_SMP=y
34CONFIG_HAVE_ARM_ARCH_TIMER=y
35CONFIG_VMSPLIT_2G=y 33CONFIG_VMSPLIT_2G=y
36CONFIG_PREEMPT=y 34CONFIG_PREEMPT=y
37CONFIG_AEABI=y 35CONFIG_AEABI=y
@@ -42,8 +40,8 @@ CONFIG_CPU_FREQ=y
42CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 40CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
43CONFIG_CPU_FREQ_GOV_POWERSAVE=y 41CONFIG_CPU_FREQ_GOV_POWERSAVE=y
44CONFIG_CPU_FREQ_GOV_USERSPACE=y 42CONFIG_CPU_FREQ_GOV_USERSPACE=y
45CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
46CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 43CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
44CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
47CONFIG_ARM_IMX6Q_CPUFREQ=y 45CONFIG_ARM_IMX6Q_CPUFREQ=y
48CONFIG_ARM_IMX7D_CPUFREQ=y 46CONFIG_ARM_IMX7D_CPUFREQ=y
49CONFIG_CPU_IDLE=y 47CONFIG_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
65CONFIG_IPV6=y
66CONFIG_VLAN_8021Q=y 62CONFIG_VLAN_8021Q=y
67CONFIG_LLC2=y 63CONFIG_LLC2=y
68CONFIG_CAN=y 64CONFIG_CAN=y
@@ -194,10 +190,10 @@ CONFIG_GPIO_SYSFS=y
194CONFIG_GPIO_MAX732X=y 190CONFIG_GPIO_MAX732X=y
195CONFIG_GPIO_PCA953X=y 191CONFIG_GPIO_PCA953X=y
196CONFIG_GPIO_74X164=y 192CONFIG_GPIO_74X164=y
197CONFIG_POWER_SUPPLY=y
198CONFIG_SABRESD_MAX8903=y
199CONFIG_POWER_RESET=y 193CONFIG_POWER_RESET=y
200CONFIG_POWER_RESET_SYSCON_POWEROFF=y 194CONFIG_POWER_RESET_SYSCON_POWEROFF=y
195CONFIG_POWER_SUPPLY=y
196CONFIG_SABRESD_MAX8903=y
201CONFIG_SENSORS_MAX17135=y 197CONFIG_SENSORS_MAX17135=y
202CONFIG_SENSORS_MAG3110=y 198CONFIG_SENSORS_MAG3110=y
203CONFIG_THERMAL=y 199CONFIG_THERMAL=y
@@ -244,14 +240,12 @@ CONFIG_MXC_VADC=m
244CONFIG_MXC_MIPI_CSI=m 240CONFIG_MXC_MIPI_CSI=m
245CONFIG_MXC_CAMERA_OV5647_MIPI=m 241CONFIG_MXC_CAMERA_OV5647_MIPI=m
246CONFIG_SOC_CAMERA=y 242CONFIG_SOC_CAMERA=y
247CONFIG_VIDEO_MX3=y
248CONFIG_V4L_MEM2MEM_DRIVERS=y 243CONFIG_V4L_MEM2MEM_DRIVERS=y
249CONFIG_VIDEO_CODA=y 244CONFIG_VIDEO_CODA=y
250CONFIG_RADIO_SI476X=y 245CONFIG_RADIO_SI476X=y
251CONFIG_SOC_CAMERA_OV2640=y 246CONFIG_SOC_CAMERA_OV2640=y
252CONFIG_DRM=y 247CONFIG_DRM=y
253CONFIG_DRM_VIVANTE=y 248CONFIG_DRM_VIVANTE=y
254CONFIG_FB=y
255CONFIG_FB_MXS=y 249CONFIG_FB_MXS=y
256CONFIG_FB_MXC_SYNC_PANEL=y 250CONFIG_FB_MXC_SYNC_PANEL=y
257CONFIG_FB_MXC_MIPI_DSI=y 251CONFIG_FB_MXC_MIPI_DSI=y
@@ -271,7 +265,6 @@ CONFIG_LCD_L4F00242T03=y
271CONFIG_LCD_PLATFORM=y 265CONFIG_LCD_PLATFORM=y
272CONFIG_BACKLIGHT_PWM=y 266CONFIG_BACKLIGHT_PWM=y
273CONFIG_FRAMEBUFFER_CONSOLE=y 267CONFIG_FRAMEBUFFER_CONSOLE=y
274CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
275CONFIG_LOGO=y 268CONFIG_LOGO=y
276CONFIG_SOUND=y 269CONFIG_SOUND=y
277CONFIG_SND=y 270CONFIG_SND=y
@@ -293,7 +286,6 @@ CONFIG_SND_SOC_IMX_HDMI=y
293CONFIG_SND_SIMPLE_CARD=y 286CONFIG_SND_SIMPLE_CARD=y
294CONFIG_USB=y 287CONFIG_USB=y
295CONFIG_USB_OTG_WHITELIST=y 288CONFIG_USB_OTG_WHITELIST=y
296CONFIG_USB_OTG_FSM=y
297CONFIG_USB_EHCI_HCD=y 289CONFIG_USB_EHCI_HCD=y
298CONFIG_USB_EHCI_MXC=y 290CONFIG_USB_EHCI_MXC=y
299CONFIG_USB_HCD_TEST_MODE=y 291CONFIG_USB_HCD_TEST_MODE=y
@@ -353,10 +345,10 @@ CONFIG_RTC_DRV_MC13XXX=y
353CONFIG_RTC_DRV_MXC=y 345CONFIG_RTC_DRV_MXC=y
354CONFIG_RTC_DRV_SNVS=y 346CONFIG_RTC_DRV_SNVS=y
355CONFIG_DMADEVICES=y 347CONFIG_DMADEVICES=y
356CONFIG_MXC_PXP_V2=y
357CONFIG_MXC_PXP_V3=y
358CONFIG_IMX_SDMA=y 348CONFIG_IMX_SDMA=y
359CONFIG_MXS_DMA=y 349CONFIG_MXS_DMA=y
350CONFIG_MXC_PXP_V2=y
351CONFIG_MXC_PXP_V3=y
360CONFIG_DMATEST=m 352CONFIG_DMATEST=m
361CONFIG_STAGING=y 353CONFIG_STAGING=y
362CONFIG_STAGING_MEDIA=y 354CONFIG_STAGING_MEDIA=y
@@ -373,9 +365,6 @@ CONFIG_EXT2_FS_SECURITY=y
373CONFIG_EXT3_FS=y 365CONFIG_EXT3_FS=y
374CONFIG_EXT3_FS_POSIX_ACL=y 366CONFIG_EXT3_FS_POSIX_ACL=y
375CONFIG_EXT3_FS_SECURITY=y 367CONFIG_EXT3_FS_SECURITY=y
376CONFIG_EXT4_FS=y
377CONFIG_EXT4_FS_POSIX_ACL=y
378CONFIG_EXT4_FS_SECURITY=y
379CONFIG_QUOTA=y 368CONFIG_QUOTA=y
380CONFIG_QUOTA_NETLINK_INTERFACE=y 369CONFIG_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
400CONFIG_NLS_ISO8859_1=y 389CONFIG_NLS_ISO8859_1=y
401CONFIG_NLS_ISO8859_15=m 390CONFIG_NLS_ISO8859_15=m
402CONFIG_NLS_UTF8=y 391CONFIG_NLS_UTF8=y
403CONFIG_DEBUG_FS=y
404CONFIG_MAGIC_SYSRQ=y 392CONFIG_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
423CONFIG_CRYPTO_WP512=y 411CONFIG_CRYPTO_WP512=y
424CONFIG_CRYPTO_BLOWFISH=y 412CONFIG_CRYPTO_BLOWFISH=y
425CONFIG_CRYPTO_CAMELLIA=y 413CONFIG_CRYPTO_CAMELLIA=y
426CONFIG_CRYPTO_DES=y
427CONFIG_CRYPTO_TWOFISH=y 414CONFIG_CRYPTO_TWOFISH=y
428# CONFIG_CRYPTO_ANSI_CPRNG is not set
429CONFIG_CRYPTO_DEV_FSL_CAAM=y 415CONFIG_CRYPTO_DEV_FSL_CAAM=y
430CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y 416CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
431CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y 417CONFIG_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
4SUMMARY = "FSL Community BSP i.MX Linux kernel with backported features and fixes" 4SUMMARY = "FSL Community BSP i.MX Linux kernel with backported features and fixes"
5DESCRIPTION = "Linux kernel based on NXP 4.1.15-1.2.0 GA release, used by FSL Community BSP in order to \ 5DESCRIPTION = "Linux kernel based on NXP 4.9.11-1.0.0 GA release, used by FSL Community BSP in order to \
6provide support for i.MX based platforms and include official Linux kernel stable updates, backported \ 6provide support for i.MX based platforms and include official Linux kernel stable updates, backported \
7features and fixes coming from the vendors, kernel community or FSL Community itself." 7features and fixes coming from the vendors, kernel community or FSL Community itself."
8 8
@@ -10,7 +10,7 @@ include linux-fslc.inc
10 10
11PV .= "+git${SRCPV}" 11PV .= "+git${SRCPV}"
12 12
13SRCBRANCH = "4.1-2.0.x-imx" 13SRCBRANCH = "4.9-1.0.x-imx"
14SRCREV = "6c1ad49339f46ff453d6f07be7d63fd495069bfe" 14SRCREV = "953c6e30c9701fda69ef08e2476c541dc4fb1453"
15 15
16COMPATIBLE_MACHINE = "(mx6|mx7)" 16COMPATIBLE_MACHINE = "(mx6|mx7)"