summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-01-04 09:53:26 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:26 -0300
commitaed168c2d09c97349e5ccf9b707ed522fc56ee77 (patch)
tree90c51ba50baddb90d65117b0349e260ef711ec8c /recipes-kernel
parent4155fe2fdb09f03d82f544439efc136e39559825 (diff)
downloadmeta-freescale-aed168c2d09c97349e5ccf9b707ed522fc56ee77.tar.gz
linux-fslc-imx: Upgrade to the 3.14.52-1.1.0 GA based fork
The FSLC kernel fork has been updated for the 3.14-1.52-1.1.0 GA release. It is a consolidated release covering all i.MX active product lines covering: - i.MX6QDL - i.MX6SL - i.MX6SX - i.MX6UL - i.MX7D The patch also updates the linux-fslc-imx-rt flavour for the very same kernel fork and ensures people uses the built-in Vivante GPU driver, when using the Linux RT support, as the external kernel module does not support it yet. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-fslc-imx-rt/0001-fix-build.patch (renamed from recipes-kernel/linux/linux-fslc-mx6-rt/0001-fix-build.patch)0
-rw-r--r--recipes-kernel/linux/linux-fslc-imx-rt/0003-no-split-ptlocks.patch (renamed from recipes-kernel/linux/linux-fslc-mx6-rt/0003-no-split-ptlocks.patch)0
-rw-r--r--recipes-kernel/linux/linux-fslc-imx-rt/0004-imx-sdma-channel-use-raw-spinlock.patch (renamed from recipes-kernel/linux/linux-fslc-mx6-rt/0004-imx-sdma-channel-use-raw-spinlock.patch)0
-rw-r--r--recipes-kernel/linux/linux-fslc-imx-rt/defconfig (renamed from recipes-kernel/linux/linux-fslc-mx6-rt/defconfig)0
-rw-r--r--recipes-kernel/linux/linux-fslc-imx-rt_3.14-1.1.x.bb31
-rw-r--r--recipes-kernel/linux/linux-fslc-imx/defconfig (renamed from recipes-kernel/linux/linux-fslc-mx6/defconfig)55
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_3.14-1.1.x.bb (renamed from recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb)10
-rw-r--r--recipes-kernel/linux/linux-fslc-mx6-rt/0002-fix-build-with-rt-enabled.patch19
-rw-r--r--recipes-kernel/linux/linux-fslc-mx6-rt_3.14-1.0.x.bb27
9 files changed, 80 insertions, 62 deletions
diff --git a/recipes-kernel/linux/linux-fslc-mx6-rt/0001-fix-build.patch b/recipes-kernel/linux/linux-fslc-imx-rt/0001-fix-build.patch
index 4be4066d..4be4066d 100644
--- a/recipes-kernel/linux/linux-fslc-mx6-rt/0001-fix-build.patch
+++ b/recipes-kernel/linux/linux-fslc-imx-rt/0001-fix-build.patch
diff --git a/recipes-kernel/linux/linux-fslc-mx6-rt/0003-no-split-ptlocks.patch b/recipes-kernel/linux/linux-fslc-imx-rt/0003-no-split-ptlocks.patch
index 40c012a5..40c012a5 100644
--- a/recipes-kernel/linux/linux-fslc-mx6-rt/0003-no-split-ptlocks.patch
+++ b/recipes-kernel/linux/linux-fslc-imx-rt/0003-no-split-ptlocks.patch
diff --git a/recipes-kernel/linux/linux-fslc-mx6-rt/0004-imx-sdma-channel-use-raw-spinlock.patch b/recipes-kernel/linux/linux-fslc-imx-rt/0004-imx-sdma-channel-use-raw-spinlock.patch
index da36213c..da36213c 100644
--- a/recipes-kernel/linux/linux-fslc-mx6-rt/0004-imx-sdma-channel-use-raw-spinlock.patch
+++ b/recipes-kernel/linux/linux-fslc-imx-rt/0004-imx-sdma-channel-use-raw-spinlock.patch
diff --git a/recipes-kernel/linux/linux-fslc-mx6-rt/defconfig b/recipes-kernel/linux/linux-fslc-imx-rt/defconfig
index e741b19f..e741b19f 100644
--- a/recipes-kernel/linux/linux-fslc-mx6-rt/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx-rt/defconfig
diff --git a/recipes-kernel/linux/linux-fslc-imx-rt_3.14-1.1.x.bb b/recipes-kernel/linux/linux-fslc-imx-rt_3.14-1.1.x.bb
new file mode 100644
index 00000000..0a7bd36d
--- /dev/null
+++ b/recipes-kernel/linux/linux-fslc-imx-rt_3.14-1.1.x.bb
@@ -0,0 +1,31 @@
1SUMMARY = "Realtime version of the FSL Community BSP i.MX6 Linux kernel with backported features and fixes"
2DESCRIPTION = "Linux kernel based on Freescale 3.14.52-1.1.0 GA release, used by FSL Community BSP in order to \
3provide support for i.MX6 based platforms and include official Linux kernel stable updates, backported \
4features and fixes coming from the vendors, kernel community or FSL Community itself. \
5In addition, this kernel has the realtime patch (PREEMPT_RT) applied."
6
7include linux-fslc.inc
8
9PV .= "+git${SRCPV}"
10
11SRCBRANCH = "3.14-1.1.x-imx"
12SRCREV = "327d5c9063b715c91a88655533d5e477a0afe218"
13
14SRC_URI += "\
15 https://www.kernel.org/pub/linux/kernel/projects/rt/3.14/patch-3.14.58-rt59.patch.gz;name=rt-patch1 \
16 file://0001-fix-build.patch \
17 file://0003-no-split-ptlocks.patch \
18 file://0004-imx-sdma-channel-use-raw-spinlock.patch \
19"
20
21SRC_URI[rt-patch1.md5sum] = "d4b380eab31878e607e92fec3e150e8f"
22SRC_URI[rt-patch1.sha256sum] = "56c8a9fc6b1c11883ee40b4edc529d19cf9ba0855dd0d0878581900f51d60064"
23
24python () {
25 using_builtin_driver = (d.getVar("MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE", True) or "") != "1"
26 if not using_builtin_driver:
27 raise bb.parse.SkipPackage('You must use the builtin driver with the Linux RT patch as the external module does not yet include support for it. Set "MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE" accordingly.')
28}
29
30
31COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-kernel/linux/linux-fslc-mx6/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig
index 80f49e64..4fe1f7e8 100644
--- a/recipes-kernel/linux/linux-fslc-mx6/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/defconfig
@@ -1,8 +1,9 @@
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
5CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=18 7CONFIG_LOG_BUF_SHIFT=18
7CONFIG_CGROUPS=y 8CONFIG_CGROUPS=y
8CONFIG_RELAY=y 9CONFIG_RELAY=y
@@ -26,9 +27,12 @@ CONFIG_SOC_IMX53=y
26CONFIG_SOC_IMX6Q=y 27CONFIG_SOC_IMX6Q=y
27CONFIG_SOC_IMX6SL=y 28CONFIG_SOC_IMX6SL=y
28CONFIG_SOC_IMX6SX=y 29CONFIG_SOC_IMX6SX=y
30CONFIG_SOC_IMX6UL=y
31CONFIG_SOC_IMX7D=y
29CONFIG_SOC_VF610=y 32CONFIG_SOC_VF610=y
30# CONFIG_SWP_EMULATE is not set 33# CONFIG_SWP_EMULATE is not set
31CONFIG_SMP=y 34CONFIG_SMP=y
35CONFIG_HAVE_ARM_ARCH_TIMER=y
32CONFIG_VMSPLIT_2G=y 36CONFIG_VMSPLIT_2G=y
33CONFIG_PREEMPT=y 37CONFIG_PREEMPT=y
34CONFIG_AEABI=y 38CONFIG_AEABI=y
@@ -44,6 +48,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
44CONFIG_CPU_FREQ_GOV_ONDEMAND=y 48CONFIG_CPU_FREQ_GOV_ONDEMAND=y
45CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 49CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
46CONFIG_ARM_IMX6Q_CPUFREQ=y 50CONFIG_ARM_IMX6Q_CPUFREQ=y
51CONFIG_ARM_IMX7D_CPUFREQ=y
47CONFIG_CPU_IDLE=y 52CONFIG_CPU_IDLE=y
48CONFIG_VFP=y 53CONFIG_VFP=y
49CONFIG_NEON=y 54CONFIG_NEON=y
@@ -76,7 +81,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
76CONFIG_BT_BNEP_PROTO_FILTER=y 81CONFIG_BT_BNEP_PROTO_FILTER=y
77CONFIG_BT_HIDP=y 82CONFIG_BT_HIDP=y
78CONFIG_BT_HCIBTUSB=y 83CONFIG_BT_HCIBTUSB=y
79CONFIG_BT_HCIBTSDIO=y
80CONFIG_BT_HCIUART=y 84CONFIG_BT_HCIUART=y
81CONFIG_BT_HCIUART_H4=y 85CONFIG_BT_HCIUART_H4=y
82CONFIG_BT_HCIUART_BCSP=y 86CONFIG_BT_HCIUART_BCSP=y
@@ -113,6 +117,8 @@ CONFIG_MTD_UBI=y
113CONFIG_BLK_DEV_LOOP=y 117CONFIG_BLK_DEV_LOOP=y
114CONFIG_BLK_DEV_RAM=y 118CONFIG_BLK_DEV_RAM=y
115CONFIG_BLK_DEV_RAM_SIZE=65536 119CONFIG_BLK_DEV_RAM_SIZE=65536
120CONFIG_SENSORS_FXOS8700=y
121CONFIG_SENSORS_FXAS2100X=y
116CONFIG_EEPROM_AT24=y 122CONFIG_EEPROM_AT24=y
117CONFIG_EEPROM_AT25=y 123CONFIG_EEPROM_AT25=y
118# CONFIG_SCSI_PROC_FS is not set 124# CONFIG_SCSI_PROC_FS is not set
@@ -141,33 +147,38 @@ CONFIG_SMC91X=y
141CONFIG_SMC911X=y 147CONFIG_SMC911X=y
142CONFIG_SMSC911X=y 148CONFIG_SMSC911X=y
143# CONFIG_NET_VENDOR_STMICRO is not set 149# CONFIG_NET_VENDOR_STMICRO is not set
150CONFIG_MICREL_PHY=y
144CONFIG_USB_PEGASUS=m 151CONFIG_USB_PEGASUS=m
145CONFIG_USB_RTL8150=m 152CONFIG_USB_RTL8150=m
146CONFIG_USB_RTL8152=m 153CONFIG_USB_RTL8152=m
147CONFIG_USB_USBNET=m 154CONFIG_USB_USBNET=m
148CONFIG_USB_NET_CDC_EEM=m 155CONFIG_USB_NET_CDC_EEM=m
149CONFIG_ATH_CARDS=y 156CONFIG_BCMDHD=m
150CONFIG_ATH6KL=m 157CONFIG_BCMDHD_SDIO=y
151CONFIG_ATH6KL_SDIO=m 158CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin"
152CONFIG_BRCMFMAC=m 159CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal"
160# CONFIG_RTL_CARDS is not set
153# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 161# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
154CONFIG_INPUT_EVDEV=y 162CONFIG_INPUT_EVDEV=y
155# CONFIG_INPUT_EVBUG is not set 163CONFIG_INPUT_EVBUG=m
156CONFIG_KEYBOARD_GPIO=y 164CONFIG_KEYBOARD_GPIO=y
157CONFIG_KEYBOARD_SNVS_PWRKEY=y
158CONFIG_KEYBOARD_IMX=y 165CONFIG_KEYBOARD_IMX=y
159CONFIG_MOUSE_PS2=m 166CONFIG_MOUSE_PS2=m
160CONFIG_MOUSE_PS2_ELANTECH=y 167CONFIG_MOUSE_PS2_ELANTECH=y
161CONFIG_INPUT_TOUCHSCREEN=y 168CONFIG_INPUT_TOUCHSCREEN=y
169CONFIG_TOUCHSCREEN_ADS7846=y
162CONFIG_TOUCHSCREEN_EGALAX=y 170CONFIG_TOUCHSCREEN_EGALAX=y
163CONFIG_TOUCHSCREEN_ELAN=y 171CONFIG_TOUCHSCREEN_ELAN=y
164CONFIG_TOUCHSCREEN_MAX11801=y 172CONFIG_TOUCHSCREEN_MAX11801=y
173CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
165CONFIG_TOUCHSCREEN_MC13783=y 174CONFIG_TOUCHSCREEN_MC13783=y
166CONFIG_TOUCHSCREEN_TSC2007=y 175CONFIG_TOUCHSCREEN_TSC2007=y
167CONFIG_TOUCHSCREEN_STMPE=y 176CONFIG_TOUCHSCREEN_STMPE=y
168CONFIG_INPUT_MISC=y 177CONFIG_INPUT_MISC=y
169CONFIG_INPUT_MMA8450=y 178CONFIG_INPUT_MMA8450=y
170CONFIG_INPUT_ISL29023=y 179CONFIG_INPUT_ISL29023=y
180CONFIG_INPUT_MPL3115=y
181CONFIG_SENSOR_FXLS8471=y
171CONFIG_SERIO_SERPORT=m 182CONFIG_SERIO_SERPORT=m
172# CONFIG_LEGACY_PTYS is not set 183# CONFIG_LEGACY_PTYS is not set
173# CONFIG_DEVKMEM is not set 184# CONFIG_DEVKMEM is not set
@@ -183,8 +194,11 @@ CONFIG_I2C_ALGOPCF=m
183CONFIG_I2C_ALGOPCA=m 194CONFIG_I2C_ALGOPCA=m
184CONFIG_I2C_IMX=y 195CONFIG_I2C_IMX=y
185CONFIG_SPI=y 196CONFIG_SPI=y
197CONFIG_SPI_GPIO=y
186CONFIG_SPI_IMX=y 198CONFIG_SPI_IMX=y
187CONFIG_GPIO_SYSFS=y 199CONFIG_GPIO_SYSFS=y
200CONFIG_GPIO_MAX732X=y
201CONFIG_GPIO_74X164=y
188CONFIG_POWER_SUPPLY=y 202CONFIG_POWER_SUPPLY=y
189CONFIG_SABRESD_MAX8903=y 203CONFIG_SABRESD_MAX8903=y
190CONFIG_SENSORS_MAX17135=y 204CONFIG_SENSORS_MAX17135=y
@@ -205,6 +219,7 @@ CONFIG_REGULATOR=y
205CONFIG_REGULATOR_FIXED_VOLTAGE=y 219CONFIG_REGULATOR_FIXED_VOLTAGE=y
206CONFIG_REGULATOR_ANATOP=y 220CONFIG_REGULATOR_ANATOP=y
207CONFIG_REGULATOR_DA9052=y 221CONFIG_REGULATOR_DA9052=y
222CONFIG_REGULATOR_GPIO=y
208CONFIG_REGULATOR_MAX17135=y 223CONFIG_REGULATOR_MAX17135=y
209CONFIG_REGULATOR_MC13783=y 224CONFIG_REGULATOR_MC13783=y
210CONFIG_REGULATOR_MC13892=y 225CONFIG_REGULATOR_MC13892=y
@@ -229,6 +244,8 @@ CONFIG_VIDEO_MXC_IPU_OUTPUT=y
229CONFIG_VIDEO_MXC_PXP_V4L2=y 244CONFIG_VIDEO_MXC_PXP_V4L2=y
230CONFIG_VIDEO_MXC_CSI_CAMERA=m 245CONFIG_VIDEO_MXC_CSI_CAMERA=m
231CONFIG_MXC_VADC=m 246CONFIG_MXC_VADC=m
247CONFIG_MXC_MIPI_CSI=m
248CONFIG_MXC_CAMERA_OV5647_MIPI=m
232CONFIG_SOC_CAMERA=y 249CONFIG_SOC_CAMERA=y
233CONFIG_VIDEO_MX3=y 250CONFIG_VIDEO_MX3=y
234CONFIG_V4L_MEM2MEM_DRIVERS=y 251CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -248,15 +265,17 @@ CONFIG_BACKLIGHT_PWM=y
248CONFIG_FB_MXC_SYNC_PANEL=y 265CONFIG_FB_MXC_SYNC_PANEL=y
249CONFIG_FB_MXC_LDB=y 266CONFIG_FB_MXC_LDB=y
250CONFIG_FB_MXC_MIPI_DSI=y 267CONFIG_FB_MXC_MIPI_DSI=y
268CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y
251CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y 269CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
252CONFIG_FB_MXC_HDMI=y 270CONFIG_FB_MXC_HDMI=y
253CONFIG_FB_MXC_EINK_PANEL=y 271CONFIG_FB_MXC_EINK_PANEL=y
272CONFIG_FB_MXC_EINK_V2_PANEL=y
254CONFIG_FB_MXS_SII902X=y 273CONFIG_FB_MXS_SII902X=y
255CONFIG_FB_MXC_DCIC=m 274CONFIG_FB_MXC_DCIC=m
256CONFIG_HANNSTAR_CABC=y 275CONFIG_HANNSTAR_CABC=y
257CONFIG_FRAMEBUFFER_CONSOLE=y 276CONFIG_FRAMEBUFFER_CONSOLE=y
258CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 277CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
259# CONFIG_LOGO is not set 278CONFIG_LOGO=y
260CONFIG_SOUND=y 279CONFIG_SOUND=y
261CONFIG_SND=y 280CONFIG_SND=y
262CONFIG_SND_USB_AUDIO=m 281CONFIG_SND_USB_AUDIO=m
@@ -264,6 +283,9 @@ CONFIG_SND_SOC=y
264CONFIG_SND_IMX_SOC=y 283CONFIG_SND_IMX_SOC=y
265CONFIG_SND_SOC_EUKREA_TLV320=y 284CONFIG_SND_SOC_EUKREA_TLV320=y
266CONFIG_SND_SOC_IMX_CS42888=y 285CONFIG_SND_SOC_IMX_CS42888=y
286CONFIG_SND_SOC_IMX_SII902X=y
287CONFIG_SND_SOC_IMX_WM8958=y
288CONFIG_SND_SOC_IMX_WM8960=y
267CONFIG_SND_SOC_IMX_WM8962=y 289CONFIG_SND_SOC_IMX_WM8962=y
268CONFIG_SND_SOC_IMX_SGTL5000=y 290CONFIG_SND_SOC_IMX_SGTL5000=y
269CONFIG_SND_SOC_IMX_MQS=y 291CONFIG_SND_SOC_IMX_MQS=y
@@ -272,8 +294,11 @@ CONFIG_SND_SOC_IMX_MC13783=y
272CONFIG_SND_SOC_IMX_HDMI=y 294CONFIG_SND_SOC_IMX_HDMI=y
273CONFIG_SND_SOC_IMX_SI476X=y 295CONFIG_SND_SOC_IMX_SI476X=y
274CONFIG_USB=y 296CONFIG_USB=y
297CONFIG_USB_OTG_WHITELIST=y
298CONFIG_USB_OTG_FSM=y
275CONFIG_USB_EHCI_HCD=y 299CONFIG_USB_EHCI_HCD=y
276CONFIG_USB_EHCI_MXC=y 300CONFIG_USB_EHCI_MXC=y
301CONFIG_USB_HCD_TEST_MODE=y
277CONFIG_USB_ACM=m 302CONFIG_USB_ACM=m
278CONFIG_USB_STORAGE=y 303CONFIG_USB_STORAGE=y
279CONFIG_USB_CHIPIDEA=y 304CONFIG_USB_CHIPIDEA=y
@@ -283,7 +308,7 @@ CONFIG_USB_SERIAL=m
283CONFIG_USB_SERIAL_GENERIC=y 308CONFIG_USB_SERIAL_GENERIC=y
284CONFIG_USB_SERIAL_FTDI_SIO=m 309CONFIG_USB_SERIAL_FTDI_SIO=m
285CONFIG_USB_SERIAL_OPTION=m 310CONFIG_USB_SERIAL_OPTION=m
286CONFIG_USB_EHSET_TEST_FIXTURE=m 311CONFIG_USB_EHSET_TEST_FIXTURE=y
287CONFIG_NOP_USB_XCEIV=y 312CONFIG_NOP_USB_XCEIV=y
288CONFIG_USB_MXS_PHY=y 313CONFIG_USB_MXS_PHY=y
289CONFIG_USB_GADGET=y 314CONFIG_USB_GADGET=y
@@ -312,8 +337,9 @@ CONFIG_MMC_SDHCI_PLTFM=y
312CONFIG_MMC_SDHCI_ESDHC_IMX=y 337CONFIG_MMC_SDHCI_ESDHC_IMX=y
313CONFIG_MXC_IPU=y 338CONFIG_MXC_IPU=y
314CONFIG_MXC_GPU_VIV=y 339CONFIG_MXC_GPU_VIV=y
340CONFIG_MXC_IPU_V3_PRE=y
315CONFIG_MXC_MIPI_CSI2=y 341CONFIG_MXC_MIPI_CSI2=y
316CONFIG_MXC_MLB150=m 342CONFIG_MXC_SIM=y
317CONFIG_NEW_LEDS=y 343CONFIG_NEW_LEDS=y
318CONFIG_LEDS_CLASS=y 344CONFIG_LEDS_CLASS=y
319CONFIG_LEDS_GPIO=y 345CONFIG_LEDS_GPIO=y
@@ -330,6 +356,7 @@ CONFIG_RTC_DRV_MXC=y
330CONFIG_RTC_DRV_SNVS=y 356CONFIG_RTC_DRV_SNVS=y
331CONFIG_DMADEVICES=y 357CONFIG_DMADEVICES=y
332CONFIG_MXC_PXP_V2=y 358CONFIG_MXC_PXP_V2=y
359CONFIG_MXC_PXP_V3=y
333CONFIG_IMX_SDMA=y 360CONFIG_IMX_SDMA=y
334CONFIG_MXS_DMA=y 361CONFIG_MXS_DMA=y
335CONFIG_STAGING=y 362CONFIG_STAGING=y
@@ -337,6 +364,7 @@ CONFIG_STAGING_MEDIA=y
337# CONFIG_IOMMU_SUPPORT is not set 364# CONFIG_IOMMU_SUPPORT is not set
338CONFIG_IIO=y 365CONFIG_IIO=y
339CONFIG_VF610_ADC=y 366CONFIG_VF610_ADC=y
367CONFIG_AD2802A=y
340CONFIG_PWM=y 368CONFIG_PWM=y
341CONFIG_PWM_IMX=y 369CONFIG_PWM_IMX=y
342CONFIG_EXT2_FS=y 370CONFIG_EXT2_FS=y
@@ -378,6 +406,11 @@ CONFIG_MAGIC_SYSRQ=y
378# CONFIG_SCHED_DEBUG is not set 406# CONFIG_SCHED_DEBUG is not set
379# CONFIG_DEBUG_BUGVERBOSE is not set 407# CONFIG_DEBUG_BUGVERBOSE is not set
380# CONFIG_FTRACE is not set 408# CONFIG_FTRACE is not set
409CONFIG_CORESIGHT=y
410CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
411CONFIG_CORESIGHT_SINK_TPIU=y
412CONFIG_CORESIGHT_SINK_ETBV10=y
413CONFIG_CORESIGHT_SOURCE_ETM3X=y
381CONFIG_SECURITYFS=y 414CONFIG_SECURITYFS=y
382CONFIG_CRYPTO_USER=y 415CONFIG_CRYPTO_USER=y
383CONFIG_CRYPTO_TEST=m 416CONFIG_CRYPTO_TEST=m
diff --git a/recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb b/recipes-kernel/linux/linux-fslc-imx_3.14-1.1.x.bb
index f46c0b3c..a8d42fa6 100644
--- a/recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_3.14-1.1.x.bb
@@ -1,8 +1,8 @@
1# Copyright (C) 2015 O.S. Systems Software LTDA. 1# Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
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.MX6 Linux kernel with backported features and fixes" 4SUMMARY = "FSL Community BSP i.MX6 Linux kernel with backported features and fixes"
5DESCRIPTION = "Linux kernel based on Freescale 3.14.28 GA release, used by FSL Community BSP in order to \ 5DESCRIPTION = "Linux kernel based on Freescale 3.14.52-1.1.0 GA release, used by FSL Community BSP in order to \
6provide support for i.MX6 based platforms and include official Linux kernel stable updates, backported \ 6provide support for i.MX6 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 = "3.14-1.0.x-mx6" 13SRCBRANCH = "3.14-1.1.x-imx"
14SRCREV = "964e5a3e65936e07f5d5189d233b8f8843687776" 14SRCREV = "327d5c9063b715c91a88655533d5e477a0afe218"
15 15
16COMPATIBLE_MACHINE = "(mx6)" 16COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-kernel/linux/linux-fslc-mx6-rt/0002-fix-build-with-rt-enabled.patch b/recipes-kernel/linux/linux-fslc-mx6-rt/0002-fix-build-with-rt-enabled.patch
deleted file mode 100644
index 83652c96..00000000
--- a/recipes-kernel/linux/linux-fslc-mx6-rt/0002-fix-build-with-rt-enabled.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Fix build error when PREEMPT_RT_FULL is enabled
2
3Upstream-Status: Pending
4
5Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
6
7Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
8===================================================================
9--- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
10+++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
11@@ -3266,7 +3266,7 @@ gckOS_CreateMutex(
12 gcmkONERROR(gckOS_Allocate(Os, gcmSIZEOF(struct mutex), Mutex));
13
14 /* Initialize the mutex. */
15- mutex_init(*Mutex);
16+ mutex_init((struct mutex*)*Mutex);
17
18 /* Return status. */
19 gcmkFOOTER_ARG("*Mutex=0x%X", *Mutex);
diff --git a/recipes-kernel/linux/linux-fslc-mx6-rt_3.14-1.0.x.bb b/recipes-kernel/linux/linux-fslc-mx6-rt_3.14-1.0.x.bb
deleted file mode 100644
index af65b725..00000000
--- a/recipes-kernel/linux/linux-fslc-mx6-rt_3.14-1.0.x.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1# Adapted from linux-fslc-mx6_3.14-1.0.x.bb
2
3SUMMARY = "Realtime version of the FSL Community BSP i.MX6 Linux kernel with backported features and fixes"
4DESCRIPTION = "Linux kernel based on Freescale 3.14.28 GA release, used by FSL Community BSP in order to \
5provide support for i.MX6 based platforms and include official Linux kernel stable updates, backported \
6features and fixes coming from the vendors, kernel community or FSL Community itself. \
7In addition, this kernel has the realtime patch (PREEMPT_RT) applied."
8
9include linux-fslc.inc
10
11PV .= "+git${SRCPV}"
12
13SRCBRANCH = "3.14-1.0.x-mx6"
14SRCREV = "964e5a3e65936e07f5d5189d233b8f8843687776"
15
16SRC_URI += "\
17 https://www.kernel.org/pub/linux/kernel/projects/rt/3.14/older/patch-3.14.51-rt52.patch.gz;name=rt-patch1 \
18 file://0001-fix-build.patch \
19 file://0002-fix-build-with-rt-enabled.patch \
20 file://0003-no-split-ptlocks.patch \
21 file://0004-imx-sdma-channel-use-raw-spinlock.patch \
22"
23
24SRC_URI[rt-patch1.md5sum] = "236a97a3722c21403bbe60350e9be184"
25SRC_URI[rt-patch1.sha256sum] = "a454c6fabbd3a0698feec6a1bb71bc8af8d8f40a424ca071b30bee40c32f2c20"
26
27COMPATIBLE_MACHINE = "(mx6)"