summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-10-10 18:50:02 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2014-10-11 12:46:40 -0300
commit1c1d7045696abd02aaf58e311ffae467b34bc4c1 (patch)
tree2d9dd7b92ca762dfaa555e66306367bb5098c0aa
parent959f289687c0a88ce5e836340f1253d648e5f46c (diff)
downloadmeta-fsl-arm-1c1d7045696abd02aaf58e311ffae467b34bc4c1.tar.gz
linux-fslc: Update to 3.17 release
This updates to the 3.17 release. No changes are applied on the patches-3.17 branch at this moment so it is essentially the hash of the v3.17 tag. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig10
-rw-r--r--recipes-kernel/linux/linux-fslc/mxs/defconfig1
-rw-r--r--recipes-kernel/linux/linux-fslc_3.17.bb (renamed from recipes-kernel/linux/linux-fslc_3.16.bb)6
3 files changed, 12 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index e2e1fc5..16cfec4 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -1,6 +1,6 @@
1# CONFIG_LOCALVERSION_AUTO is not set
2CONFIG_KERNEL_LZO=y 1CONFIG_KERNEL_LZO=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_FHANDLE=y
4CONFIG_NO_HZ=y 4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y 5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_LOG_BUF_SHIFT=18 6CONFIG_LOG_BUF_SHIFT=18
@@ -32,11 +32,12 @@ CONFIG_MACH_IMX35_DT=y
32CONFIG_MACH_PCM043=y 32CONFIG_MACH_PCM043=y
33CONFIG_MACH_MX35_3DS=y 33CONFIG_MACH_MX35_3DS=y
34CONFIG_MACH_VPR200=y 34CONFIG_MACH_VPR200=y
35CONFIG_MACH_IMX51_DT=y 35CONFIG_SOC_IMX51=y
36CONFIG_SOC_IMX50=y 36CONFIG_SOC_IMX50=y
37CONFIG_SOC_IMX53=y 37CONFIG_SOC_IMX53=y
38CONFIG_SOC_IMX6Q=y 38CONFIG_SOC_IMX6Q=y
39CONFIG_SOC_IMX6SL=y 39CONFIG_SOC_IMX6SL=y
40CONFIG_SOC_IMX6SX=y
40CONFIG_SOC_VF610=y 41CONFIG_SOC_VF610=y
41CONFIG_PCI=y 42CONFIG_PCI=y
42CONFIG_PCI_IMX6=y 43CONFIG_PCI_IMX6=y
@@ -68,6 +69,8 @@ CONFIG_IP_PNP_DHCP=y
68# CONFIG_INET_LRO is not set 69# CONFIG_INET_LRO is not set
69CONFIG_IPV6=y 70CONFIG_IPV6=y
70CONFIG_NETFILTER=y 71CONFIG_NETFILTER=y
72CONFIG_CAN=y
73CONFIG_CAN_FLEXCAN=y
71CONFIG_CFG80211=y 74CONFIG_CFG80211=y
72CONFIG_MAC80211=y 75CONFIG_MAC80211=y
73CONFIG_RFKILL=y 76CONFIG_RFKILL=y
@@ -161,6 +164,7 @@ CONFIG_SPI=y
161CONFIG_SPI_IMX=y 164CONFIG_SPI_IMX=y
162CONFIG_GPIO_SYSFS=y 165CONFIG_GPIO_SYSFS=y
163CONFIG_GPIO_MC9S08DZ60=y 166CONFIG_GPIO_MC9S08DZ60=y
167CONFIG_GPIO_STMPE=y
164# CONFIG_HWMON is not set 168# CONFIG_HWMON is not set
165CONFIG_WATCHDOG=y 169CONFIG_WATCHDOG=y
166CONFIG_IMX2_WDT=y 170CONFIG_IMX2_WDT=y
@@ -243,6 +247,7 @@ CONFIG_RTC_DRV_SNVS=y
243CONFIG_DMADEVICES=y 247CONFIG_DMADEVICES=y
244CONFIG_IMX_SDMA=y 248CONFIG_IMX_SDMA=y
245CONFIG_MXS_DMA=y 249CONFIG_MXS_DMA=y
250CONFIG_FSL_EDMA=y
246CONFIG_STAGING=y 251CONFIG_STAGING=y
247CONFIG_DRM_IMX=y 252CONFIG_DRM_IMX=y
248CONFIG_DRM_IMX_FB_HELPER=y 253CONFIG_DRM_IMX_FB_HELPER=y
@@ -289,6 +294,7 @@ CONFIG_NLS_ASCII=y
289CONFIG_NLS_ISO8859_1=y 294CONFIG_NLS_ISO8859_1=y
290CONFIG_NLS_ISO8859_15=m 295CONFIG_NLS_ISO8859_15=m
291CONFIG_NLS_UTF8=y 296CONFIG_NLS_UTF8=y
297CONFIG_PRINTK_TIME=y
292CONFIG_DEBUG_FS=y 298CONFIG_DEBUG_FS=y
293CONFIG_MAGIC_SYSRQ=y 299CONFIG_MAGIC_SYSRQ=y
294# CONFIG_SCHED_DEBUG is not set 300# CONFIG_SCHED_DEBUG is not set
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig
index 8ccedc7..64cd52d 100644
--- a/recipes-kernel/linux/linux-fslc/mxs/defconfig
+++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig
@@ -1,4 +1,5 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_FHANDLE=y
2CONFIG_NO_HZ=y 3CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y 4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_TASKSTATS=y 5CONFIG_TASKSTATS=y
diff --git a/recipes-kernel/linux/linux-fslc_3.16.bb b/recipes-kernel/linux/linux-fslc_3.17.bb
index f7193ba..f42505d 100644
--- a/recipes-kernel/linux/linux-fslc_3.16.bb
+++ b/recipes-kernel/linux/linux-fslc_3.17.bb
@@ -9,9 +9,9 @@ upstreaming."
9 9
10include linux-fslc.inc 10include linux-fslc.inc
11 11
12PV = "3.16+git${SRCPV}" 12PV = "3.17+git${SRCPV}"
13 13
14SRCBRANCH = "patches-3.16" 14SRCBRANCH = "patches-3.17"
15SRCREV = "bf3b99e657c8dd2ab198c4dc936c630074bfa114" 15SRCREV = "bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9"
16 16
17COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" 17COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"