summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-04-06 08:29:37 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:06:34 -0300
commitfbce73d376d0607ca4ba62db55e5b4cd12c481a0 (patch)
treea9abd89e28e5b149bcabaa32b21a71bfa65e5b37
parent6c51d593c1330d7b6da881fb3a74d2577c02c46c (diff)
downloadmeta-freescale-fbce73d376d0607ca4ba62db55e5b4cd12c481a0.tar.gz
linux-fslc-imx: Update to 4.1.15-1.0.0 GA based fork
This updates the kernel fork for the 4.1.15-1.0.0 GA and merges the 4.1.20 stable release on top of it. Up to now, no extra fixes are applied on top of it but this is likely to change as vendors start to base their work on this tree. Change-Id: I2f7c330b35f7bf2ae916b84147e445b28cb8e829 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-fslc-imx/defconfig59
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb (renamed from recipes-kernel/linux/linux-fslc-imx_3.14-1.1.x.bb)4
2 files changed, 25 insertions, 38 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig
index 4fe1f7e8..40e35b99 100644
--- a/recipes-kernel/linux/linux-fslc-imx/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/defconfig
@@ -18,10 +18,7 @@ CONFIG_MODULE_UNLOAD=y
18CONFIG_MODVERSIONS=y 18CONFIG_MODVERSIONS=y
19CONFIG_MODULE_SRCVERSION_ALL=y 19CONFIG_MODULE_SRCVERSION_ALL=y
20# CONFIG_BLK_DEV_BSG is not set 20# CONFIG_BLK_DEV_BSG is not set
21CONFIG_GPIO_PCA953X=y
22CONFIG_ARCH_MXC=y 21CONFIG_ARCH_MXC=y
23CONFIG_MACH_IMX51_DT=y
24CONFIG_MACH_EUKREA_CPUIMX51SD=y
25CONFIG_SOC_IMX50=y 22CONFIG_SOC_IMX50=y
26CONFIG_SOC_IMX53=y 23CONFIG_SOC_IMX53=y
27CONFIG_SOC_IMX6Q=y 24CONFIG_SOC_IMX6Q=y
@@ -39,13 +36,11 @@ CONFIG_AEABI=y
39CONFIG_HIGHMEM=y 36CONFIG_HIGHMEM=y
40CONFIG_CMA=y 37CONFIG_CMA=y
41CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" 38CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
42CONFIG_KEXEC=y
43CONFIG_CPU_FREQ=y 39CONFIG_CPU_FREQ=y
44CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y 40CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
45CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
46CONFIG_CPU_FREQ_GOV_POWERSAVE=y 41CONFIG_CPU_FREQ_GOV_POWERSAVE=y
47CONFIG_CPU_FREQ_GOV_USERSPACE=y 42CONFIG_CPU_FREQ_GOV_USERSPACE=y
48CONFIG_CPU_FREQ_GOV_ONDEMAND=y 43CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
49CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 44CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
50CONFIG_ARM_IMX6Q_CPUFREQ=y 45CONFIG_ARM_IMX6Q_CPUFREQ=y
51CONFIG_ARM_IMX7D_CPUFREQ=y 46CONFIG_ARM_IMX7D_CPUFREQ=y
@@ -53,7 +48,6 @@ CONFIG_CPU_IDLE=y
53CONFIG_VFP=y 48CONFIG_VFP=y
54CONFIG_NEON=y 49CONFIG_NEON=y
55CONFIG_BINFMT_MISC=m 50CONFIG_BINFMT_MISC=m
56CONFIG_PM_RUNTIME=y
57CONFIG_PM_DEBUG=y 51CONFIG_PM_DEBUG=y
58CONFIG_PM_TEST_SUSPEND=y 52CONFIG_PM_TEST_SUSPEND=y
59CONFIG_NET=y 53CONFIG_NET=y
@@ -67,7 +61,6 @@ CONFIG_IP_PNP_DHCP=y
67# CONFIG_INET_XFRM_MODE_BEET is not set 61# CONFIG_INET_XFRM_MODE_BEET is not set
68# CONFIG_INET_LRO is not set 62# CONFIG_INET_LRO is not set
69CONFIG_IPV6=y 63CONFIG_IPV6=y
70CONFIG_NETFILTER=y
71CONFIG_VLAN_8021Q=y 64CONFIG_VLAN_8021Q=y
72CONFIG_LLC2=y 65CONFIG_LLC2=y
73CONFIG_CAN=y 66CONFIG_CAN=y
@@ -82,7 +75,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
82CONFIG_BT_HIDP=y 75CONFIG_BT_HIDP=y
83CONFIG_BT_HCIBTUSB=y 76CONFIG_BT_HCIBTUSB=y
84CONFIG_BT_HCIUART=y 77CONFIG_BT_HCIUART=y
85CONFIG_BT_HCIUART_H4=y
86CONFIG_BT_HCIUART_BCSP=y 78CONFIG_BT_HCIUART_BCSP=y
87CONFIG_BT_HCIUART_ATH3K=y 79CONFIG_BT_HCIUART_ATH3K=y
88CONFIG_BT_HCIBCM203X=y 80CONFIG_BT_HCIBCM203X=y
@@ -93,7 +85,7 @@ CONFIG_DEVTMPFS=y
93CONFIG_DEVTMPFS_MOUNT=y 85CONFIG_DEVTMPFS_MOUNT=y
94# CONFIG_STANDALONE is not set 86# CONFIG_STANDALONE is not set
95CONFIG_DMA_CMA=y 87CONFIG_DMA_CMA=y
96CONFIG_CMA_SIZE_MBYTES=320 88CONFIG_CMA_SIZE_MBYTES=0
97CONFIG_IMX_WEIM=y 89CONFIG_IMX_WEIM=y
98CONFIG_CONNECTOR=y 90CONFIG_CONNECTOR=y
99CONFIG_MTD=y 91CONFIG_MTD=y
@@ -123,7 +115,6 @@ CONFIG_EEPROM_AT24=y
123CONFIG_EEPROM_AT25=y 115CONFIG_EEPROM_AT25=y
124# CONFIG_SCSI_PROC_FS is not set 116# CONFIG_SCSI_PROC_FS is not set
125CONFIG_BLK_DEV_SD=y 117CONFIG_BLK_DEV_SD=y
126CONFIG_SCSI_MULTI_LUN=y
127CONFIG_SCSI_CONSTANTS=y 118CONFIG_SCSI_CONSTANTS=y
128CONFIG_SCSI_LOGGING=y 119CONFIG_SCSI_LOGGING=y
129CONFIG_SCSI_SCAN_ASYNC=y 120CONFIG_SCSI_SCAN_ASYNC=y
@@ -168,7 +159,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
168CONFIG_INPUT_TOUCHSCREEN=y 159CONFIG_INPUT_TOUCHSCREEN=y
169CONFIG_TOUCHSCREEN_ADS7846=y 160CONFIG_TOUCHSCREEN_ADS7846=y
170CONFIG_TOUCHSCREEN_EGALAX=y 161CONFIG_TOUCHSCREEN_EGALAX=y
171CONFIG_TOUCHSCREEN_ELAN=y 162CONFIG_TOUCHSCREEN_ELAN_TS=y
172CONFIG_TOUCHSCREEN_MAX11801=y 163CONFIG_TOUCHSCREEN_MAX11801=y
173CONFIG_TOUCHSCREEN_IMX6UL_TSC=y 164CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
174CONFIG_TOUCHSCREEN_MC13783=y 165CONFIG_TOUCHSCREEN_MC13783=y
@@ -176,9 +167,9 @@ CONFIG_TOUCHSCREEN_TSC2007=y
176CONFIG_TOUCHSCREEN_STMPE=y 167CONFIG_TOUCHSCREEN_STMPE=y
177CONFIG_INPUT_MISC=y 168CONFIG_INPUT_MISC=y
178CONFIG_INPUT_MMA8450=y 169CONFIG_INPUT_MMA8450=y
179CONFIG_INPUT_ISL29023=y
180CONFIG_INPUT_MPL3115=y 170CONFIG_INPUT_MPL3115=y
181CONFIG_SENSOR_FXLS8471=y 171CONFIG_SENSOR_FXLS8471=y
172CONFIG_INPUT_ISL29023=y
182CONFIG_SERIO_SERPORT=m 173CONFIG_SERIO_SERPORT=m
183# CONFIG_LEGACY_PTYS is not set 174# CONFIG_LEGACY_PTYS is not set
184# CONFIG_DEVKMEM is not set 175# CONFIG_DEVKMEM is not set
@@ -198,9 +189,12 @@ CONFIG_SPI_GPIO=y
198CONFIG_SPI_IMX=y 189CONFIG_SPI_IMX=y
199CONFIG_GPIO_SYSFS=y 190CONFIG_GPIO_SYSFS=y
200CONFIG_GPIO_MAX732X=y 191CONFIG_GPIO_MAX732X=y
192CONFIG_GPIO_PCA953X=y
201CONFIG_GPIO_74X164=y 193CONFIG_GPIO_74X164=y
202CONFIG_POWER_SUPPLY=y 194CONFIG_POWER_SUPPLY=y
203CONFIG_SABRESD_MAX8903=y 195CONFIG_SABRESD_MAX8903=y
196CONFIG_POWER_RESET=y
197CONFIG_POWER_RESET_SYSCON_POWEROFF=y
204CONFIG_SENSORS_MAX17135=y 198CONFIG_SENSORS_MAX17135=y
205CONFIG_SENSORS_MAG3110=y 199CONFIG_SENSORS_MAG3110=y
206CONFIG_THERMAL=y 200CONFIG_THERMAL=y
@@ -256,23 +250,21 @@ CONFIG_DRM=y
256CONFIG_DRM_VIVANTE=y 250CONFIG_DRM_VIVANTE=y
257CONFIG_FB=y 251CONFIG_FB=y
258CONFIG_FB_MXS=y 252CONFIG_FB_MXS=y
259CONFIG_BACKLIGHT_LCD_SUPPORT=y
260CONFIG_LCD_CLASS_DEVICE=y
261CONFIG_LCD_L4F00242T03=y
262CONFIG_LCD_PLATFORM=y
263CONFIG_BACKLIGHT_CLASS_DEVICE=y
264CONFIG_BACKLIGHT_PWM=y
265CONFIG_FB_MXC_SYNC_PANEL=y 253CONFIG_FB_MXC_SYNC_PANEL=y
266CONFIG_FB_MXC_LDB=y
267CONFIG_FB_MXC_MIPI_DSI=y 254CONFIG_FB_MXC_MIPI_DSI=y
268CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y 255CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y
269CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y 256CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
257CONFIG_FB_MXC_LDB=y
270CONFIG_FB_MXC_HDMI=y 258CONFIG_FB_MXC_HDMI=y
271CONFIG_FB_MXC_EINK_PANEL=y
272CONFIG_FB_MXC_EINK_V2_PANEL=y
273CONFIG_FB_MXS_SII902X=y 259CONFIG_FB_MXS_SII902X=y
274CONFIG_FB_MXC_DCIC=m 260CONFIG_FB_MXC_DCIC=m
275CONFIG_HANNSTAR_CABC=y 261CONFIG_HANNSTAR_CABC=y
262CONFIG_FB_MXC_EINK_PANEL=y
263CONFIG_FB_MXC_EINK_V2_PANEL=y
264CONFIG_LCD_CLASS_DEVICE=y
265CONFIG_LCD_L4F00242T03=y
266CONFIG_LCD_PLATFORM=y
267CONFIG_BACKLIGHT_PWM=y
276CONFIG_FRAMEBUFFER_CONSOLE=y 268CONFIG_FRAMEBUFFER_CONSOLE=y
277CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 269CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
278CONFIG_LOGO=y 270CONFIG_LOGO=y
@@ -282,17 +274,17 @@ CONFIG_SND_USB_AUDIO=m
282CONFIG_SND_SOC=y 274CONFIG_SND_SOC=y
283CONFIG_SND_IMX_SOC=y 275CONFIG_SND_IMX_SOC=y
284CONFIG_SND_SOC_EUKREA_TLV320=y 276CONFIG_SND_SOC_EUKREA_TLV320=y
285CONFIG_SND_SOC_IMX_CS42888=y 277CONFIG_SND_SOC_IMX_WM8960=y
286CONFIG_SND_SOC_IMX_SII902X=y 278CONFIG_SND_SOC_IMX_SII902X=y
287CONFIG_SND_SOC_IMX_WM8958=y 279CONFIG_SND_SOC_IMX_WM8958=y
288CONFIG_SND_SOC_IMX_WM8960=y 280CONFIG_SND_SOC_IMX_CS42888=y
289CONFIG_SND_SOC_IMX_WM8962=y 281CONFIG_SND_SOC_IMX_WM8962=y
290CONFIG_SND_SOC_IMX_SGTL5000=y 282CONFIG_SND_SOC_IMX_SGTL5000=y
291CONFIG_SND_SOC_IMX_MQS=y 283CONFIG_SND_SOC_IMX_MQS=y
292CONFIG_SND_SOC_IMX_SPDIF=y 284CONFIG_SND_SOC_IMX_SPDIF=y
293CONFIG_SND_SOC_IMX_MC13783=y 285CONFIG_SND_SOC_IMX_MC13783=y
294CONFIG_SND_SOC_IMX_HDMI=y
295CONFIG_SND_SOC_IMX_SI476X=y 286CONFIG_SND_SOC_IMX_SI476X=y
287CONFIG_SND_SOC_IMX_HDMI=y
296CONFIG_USB=y 288CONFIG_USB=y
297CONFIG_USB_OTG_WHITELIST=y 289CONFIG_USB_OTG_WHITELIST=y
298CONFIG_USB_OTG_FSM=y 290CONFIG_USB_OTG_FSM=y
@@ -331,15 +323,15 @@ CONFIG_USB_GADGETFS=m
331CONFIG_USB_MASS_STORAGE=m 323CONFIG_USB_MASS_STORAGE=m
332CONFIG_USB_G_SERIAL=m 324CONFIG_USB_G_SERIAL=m
333CONFIG_MMC=y 325CONFIG_MMC=y
334CONFIG_MMC_UNSAFE_RESUME=y
335CONFIG_MMC_SDHCI=y 326CONFIG_MMC_SDHCI=y
336CONFIG_MMC_SDHCI_PLTFM=y 327CONFIG_MMC_SDHCI_PLTFM=y
337CONFIG_MMC_SDHCI_ESDHC_IMX=y 328CONFIG_MMC_SDHCI_ESDHC_IMX=y
338CONFIG_MXC_IPU=y 329CONFIG_MXC_IPU=y
339CONFIG_MXC_GPU_VIV=y
340CONFIG_MXC_IPU_V3_PRE=y 330CONFIG_MXC_IPU_V3_PRE=y
341CONFIG_MXC_MIPI_CSI2=y 331CONFIG_MXC_GPU_VIV=y
342CONFIG_MXC_SIM=y 332CONFIG_MXC_SIM=y
333CONFIG_MXC_MIPI_CSI2=y
334CONFIG_MXC_HDMI_CEC=y
343CONFIG_NEW_LEDS=y 335CONFIG_NEW_LEDS=y
344CONFIG_LEDS_CLASS=y 336CONFIG_LEDS_CLASS=y
345CONFIG_LEDS_GPIO=y 337CONFIG_LEDS_GPIO=y
@@ -359,12 +351,13 @@ CONFIG_MXC_PXP_V2=y
359CONFIG_MXC_PXP_V3=y 351CONFIG_MXC_PXP_V3=y
360CONFIG_IMX_SDMA=y 352CONFIG_IMX_SDMA=y
361CONFIG_MXS_DMA=y 353CONFIG_MXS_DMA=y
354CONFIG_DMATEST=m
362CONFIG_STAGING=y 355CONFIG_STAGING=y
363CONFIG_STAGING_MEDIA=y 356CONFIG_STAGING_MEDIA=y
364# CONFIG_IOMMU_SUPPORT is not set 357# CONFIG_IOMMU_SUPPORT is not set
365CONFIG_IIO=y 358CONFIG_IIO=y
359CONFIG_IMX7D_ADC=y
366CONFIG_VF610_ADC=y 360CONFIG_VF610_ADC=y
367CONFIG_AD2802A=y
368CONFIG_PWM=y 361CONFIG_PWM=y
369CONFIG_PWM_IMX=y 362CONFIG_PWM_IMX=y
370CONFIG_EXT2_FS=y 363CONFIG_EXT2_FS=y
@@ -406,15 +399,9 @@ CONFIG_MAGIC_SYSRQ=y
406# CONFIG_SCHED_DEBUG is not set 399# CONFIG_SCHED_DEBUG is not set
407# CONFIG_DEBUG_BUGVERBOSE is not set 400# CONFIG_DEBUG_BUGVERBOSE is not set
408# CONFIG_FTRACE is not set 401# 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
414CONFIG_SECURITYFS=y 402CONFIG_SECURITYFS=y
415CONFIG_CRYPTO_USER=y 403CONFIG_CRYPTO_USER=y
416CONFIG_CRYPTO_TEST=m 404CONFIG_CRYPTO_TEST=m
417CONFIG_CRYPTO_GCM=y
418CONFIG_CRYPTO_CBC=y 405CONFIG_CRYPTO_CBC=y
419CONFIG_CRYPTO_CTS=y 406CONFIG_CRYPTO_CTS=y
420CONFIG_CRYPTO_LRW=y 407CONFIG_CRYPTO_LRW=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_3.14-1.1.x.bb b/recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb
index a8d42fa6..bd63de84 100644
--- a/recipes-kernel/linux/linux-fslc-imx_3.14-1.1.x.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb
@@ -10,7 +10,7 @@ include linux-fslc.inc
10 10
11PV .= "+git${SRCPV}" 11PV .= "+git${SRCPV}"
12 12
13SRCBRANCH = "3.14-1.1.x-imx" 13SRCBRANCH = "4.1-1.0.x-imx"
14SRCREV = "327d5c9063b715c91a88655533d5e477a0afe218" 14SRCREV = "9c23ef6a72841cb39627754debb2a36b7062f57d"
15 15
16COMPATIBLE_MACHINE = "(mx6|mx7)" 16COMPATIBLE_MACHINE = "(mx6|mx7)"