diff options
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 10 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mxs/defconfig | 1 | ||||
-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 | ||
2 | CONFIG_KERNEL_LZO=y | 1 | CONFIG_KERNEL_LZO=y |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_FHANDLE=y | ||
4 | CONFIG_NO_HZ=y | 4 | CONFIG_NO_HZ=y |
5 | CONFIG_HIGH_RES_TIMERS=y | 5 | CONFIG_HIGH_RES_TIMERS=y |
6 | CONFIG_LOG_BUF_SHIFT=18 | 6 | CONFIG_LOG_BUF_SHIFT=18 |
@@ -32,11 +32,12 @@ CONFIG_MACH_IMX35_DT=y | |||
32 | CONFIG_MACH_PCM043=y | 32 | CONFIG_MACH_PCM043=y |
33 | CONFIG_MACH_MX35_3DS=y | 33 | CONFIG_MACH_MX35_3DS=y |
34 | CONFIG_MACH_VPR200=y | 34 | CONFIG_MACH_VPR200=y |
35 | CONFIG_MACH_IMX51_DT=y | 35 | CONFIG_SOC_IMX51=y |
36 | CONFIG_SOC_IMX50=y | 36 | CONFIG_SOC_IMX50=y |
37 | CONFIG_SOC_IMX53=y | 37 | CONFIG_SOC_IMX53=y |
38 | CONFIG_SOC_IMX6Q=y | 38 | CONFIG_SOC_IMX6Q=y |
39 | CONFIG_SOC_IMX6SL=y | 39 | CONFIG_SOC_IMX6SL=y |
40 | CONFIG_SOC_IMX6SX=y | ||
40 | CONFIG_SOC_VF610=y | 41 | CONFIG_SOC_VF610=y |
41 | CONFIG_PCI=y | 42 | CONFIG_PCI=y |
42 | CONFIG_PCI_IMX6=y | 43 | CONFIG_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 |
69 | CONFIG_IPV6=y | 70 | CONFIG_IPV6=y |
70 | CONFIG_NETFILTER=y | 71 | CONFIG_NETFILTER=y |
72 | CONFIG_CAN=y | ||
73 | CONFIG_CAN_FLEXCAN=y | ||
71 | CONFIG_CFG80211=y | 74 | CONFIG_CFG80211=y |
72 | CONFIG_MAC80211=y | 75 | CONFIG_MAC80211=y |
73 | CONFIG_RFKILL=y | 76 | CONFIG_RFKILL=y |
@@ -161,6 +164,7 @@ CONFIG_SPI=y | |||
161 | CONFIG_SPI_IMX=y | 164 | CONFIG_SPI_IMX=y |
162 | CONFIG_GPIO_SYSFS=y | 165 | CONFIG_GPIO_SYSFS=y |
163 | CONFIG_GPIO_MC9S08DZ60=y | 166 | CONFIG_GPIO_MC9S08DZ60=y |
167 | CONFIG_GPIO_STMPE=y | ||
164 | # CONFIG_HWMON is not set | 168 | # CONFIG_HWMON is not set |
165 | CONFIG_WATCHDOG=y | 169 | CONFIG_WATCHDOG=y |
166 | CONFIG_IMX2_WDT=y | 170 | CONFIG_IMX2_WDT=y |
@@ -243,6 +247,7 @@ CONFIG_RTC_DRV_SNVS=y | |||
243 | CONFIG_DMADEVICES=y | 247 | CONFIG_DMADEVICES=y |
244 | CONFIG_IMX_SDMA=y | 248 | CONFIG_IMX_SDMA=y |
245 | CONFIG_MXS_DMA=y | 249 | CONFIG_MXS_DMA=y |
250 | CONFIG_FSL_EDMA=y | ||
246 | CONFIG_STAGING=y | 251 | CONFIG_STAGING=y |
247 | CONFIG_DRM_IMX=y | 252 | CONFIG_DRM_IMX=y |
248 | CONFIG_DRM_IMX_FB_HELPER=y | 253 | CONFIG_DRM_IMX_FB_HELPER=y |
@@ -289,6 +294,7 @@ CONFIG_NLS_ASCII=y | |||
289 | CONFIG_NLS_ISO8859_1=y | 294 | CONFIG_NLS_ISO8859_1=y |
290 | CONFIG_NLS_ISO8859_15=m | 295 | CONFIG_NLS_ISO8859_15=m |
291 | CONFIG_NLS_UTF8=y | 296 | CONFIG_NLS_UTF8=y |
297 | CONFIG_PRINTK_TIME=y | ||
292 | CONFIG_DEBUG_FS=y | 298 | CONFIG_DEBUG_FS=y |
293 | CONFIG_MAGIC_SYSRQ=y | 299 | CONFIG_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 @@ | |||
1 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
2 | CONFIG_FHANDLE=y | ||
2 | CONFIG_NO_HZ=y | 3 | CONFIG_NO_HZ=y |
3 | CONFIG_HIGH_RES_TIMERS=y | 4 | CONFIG_HIGH_RES_TIMERS=y |
4 | CONFIG_TASKSTATS=y | 5 | CONFIG_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 | ||
10 | include linux-fslc.inc | 10 | include linux-fslc.inc |
11 | 11 | ||
12 | PV = "3.16+git${SRCPV}" | 12 | PV = "3.17+git${SRCPV}" |
13 | 13 | ||
14 | SRCBRANCH = "patches-3.16" | 14 | SRCBRANCH = "patches-3.17" |
15 | SRCREV = "bf3b99e657c8dd2ab198c4dc936c630074bfa114" | 15 | SRCREV = "bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" | 17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" |