diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-04-14 11:58:39 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-04-14 13:25:14 -0300 |
commit | fc553238c6210b2198582b08d075b5290718470c (patch) | |
tree | 247a1382f7bbcfc3c569ece985172fe7e55e9d4f | |
parent | bd466f3cc85fe158cef1b14978d729c9fadf1ea9 (diff) | |
download | meta-fsl-arm-fc553238c6210b2198582b08d075b5290718470c.tar.gz |
linux-fslc: Update to a Linux kernel 4.0-based fork
This updates to the revision 48dfc7c which is based on the 4.0
release. It includes following changes on top of it:
48dfc7c ARM: mxs_defconfig: Add VFAT support
07b96f4 ARM: imx_v6_v7_defconfig: Add Wireless support
a4082e7 ARM: imx_v6_v7_defconfig: Enable Bluetooth support
f91f59b ARM: dts: imx6sl-warp: Add BCM4330 support
9b26bb6 ARM: dts: imx6sl-warp: Pass 'bus-width' property
89a0a04 ARM: dts: warp: Add initial WaRP Board support
1b673ef mmc: sdhci-esdhc-imx: Call mmc_of_parse()
6e759b1 dma: imx-sdma: Add support for version 3 firmware
Change-Id: If095e7877d3675882d8877b76c7832ff6e378a93
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 61 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mxs/defconfig | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_4.0.bb (renamed from recipes-kernel/linux/linux-fslc_3.19.bb) | 6 |
3 files changed, 52 insertions, 18 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 7c2075a..f6989fb 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -41,6 +41,7 @@ CONFIG_SOC_IMX6SX=y | |||
41 | CONFIG_SOC_VF610=y | 41 | CONFIG_SOC_VF610=y |
42 | CONFIG_PCI=y | 42 | CONFIG_PCI=y |
43 | CONFIG_PCI_IMX6=y | 43 | CONFIG_PCI_IMX6=y |
44 | CONFIG_PCCARD=y | ||
44 | CONFIG_SMP=y | 45 | CONFIG_SMP=y |
45 | CONFIG_VMSPLIT_2G=y | 46 | CONFIG_VMSPLIT_2G=y |
46 | CONFIG_PREEMPT_VOLUNTARY=y | 47 | CONFIG_PREEMPT_VOLUNTARY=y |
@@ -54,7 +55,6 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y | |||
54 | CONFIG_VFP=y | 55 | CONFIG_VFP=y |
55 | CONFIG_NEON=y | 56 | CONFIG_NEON=y |
56 | CONFIG_BINFMT_MISC=m | 57 | CONFIG_BINFMT_MISC=m |
57 | CONFIG_PM=y | ||
58 | CONFIG_PM_DEBUG=y | 58 | CONFIG_PM_DEBUG=y |
59 | CONFIG_PM_TEST_SUSPEND=y | 59 | CONFIG_PM_TEST_SUSPEND=y |
60 | CONFIG_NET=y | 60 | CONFIG_NET=y |
@@ -71,7 +71,11 @@ CONFIG_IPV6=y | |||
71 | CONFIG_NETFILTER=y | 71 | CONFIG_NETFILTER=y |
72 | CONFIG_CAN=y | 72 | CONFIG_CAN=y |
73 | CONFIG_CAN_FLEXCAN=y | 73 | CONFIG_CAN_FLEXCAN=y |
74 | CONFIG_BT=y | ||
75 | CONFIG_BT_HCIUART=y | ||
76 | CONFIG_BT_HCIUART_3WIRE=y | ||
74 | CONFIG_CFG80211=y | 77 | CONFIG_CFG80211=y |
78 | CONFIG_CFG80211_WEXT=y | ||
75 | CONFIG_MAC80211=y | 79 | CONFIG_MAC80211=y |
76 | CONFIG_RFKILL=y | 80 | CONFIG_RFKILL=y |
77 | CONFIG_RFKILL_INPUT=y | 81 | CONFIG_RFKILL_INPUT=y |
@@ -97,6 +101,7 @@ CONFIG_MTD_NAND=y | |||
97 | CONFIG_MTD_NAND_GPMI_NAND=y | 101 | CONFIG_MTD_NAND_GPMI_NAND=y |
98 | CONFIG_MTD_NAND_MXC=y | 102 | CONFIG_MTD_NAND_MXC=y |
99 | CONFIG_MTD_SPI_NOR=y | 103 | CONFIG_MTD_SPI_NOR=y |
104 | CONFIG_SPI_FSL_QUADSPI=y | ||
100 | CONFIG_MTD_UBI=y | 105 | CONFIG_MTD_UBI=y |
101 | CONFIG_BLK_DEV_LOOP=y | 106 | CONFIG_BLK_DEV_LOOP=y |
102 | CONFIG_BLK_DEV_RAM=y | 107 | CONFIG_BLK_DEV_RAM=y |
@@ -129,7 +134,13 @@ CONFIG_SMC911X=y | |||
129 | CONFIG_SMSC911X=y | 134 | CONFIG_SMSC911X=y |
130 | # CONFIG_NET_VENDOR_STMICRO is not set | 135 | # CONFIG_NET_VENDOR_STMICRO is not set |
131 | CONFIG_AT803X_PHY=y | 136 | CONFIG_AT803X_PHY=y |
132 | CONFIG_BRCMFMAC=m | 137 | CONFIG_USB_PEGASUS=m |
138 | CONFIG_USB_RTL8150=m | ||
139 | CONFIG_USB_RTL8152=m | ||
140 | CONFIG_USB_USBNET=m | ||
141 | CONFIG_USB_NET_CDC_EEM=m | ||
142 | CONFIG_PCMCIA_RAYCS=y | ||
143 | CONFIG_BRCMFMAC=y | ||
133 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 144 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
134 | CONFIG_INPUT_EVDEV=y | 145 | CONFIG_INPUT_EVDEV=y |
135 | CONFIG_INPUT_EVBUG=m | 146 | CONFIG_INPUT_EVBUG=m |
@@ -163,13 +174,14 @@ CONFIG_SPI_IMX=y | |||
163 | CONFIG_GPIO_SYSFS=y | 174 | CONFIG_GPIO_SYSFS=y |
164 | CONFIG_GPIO_MC9S08DZ60=y | 175 | CONFIG_GPIO_MC9S08DZ60=y |
165 | CONFIG_GPIO_STMPE=y | 176 | CONFIG_GPIO_STMPE=y |
177 | CONFIG_POWER_SUPPLY=y | ||
178 | CONFIG_POWER_RESET=y | ||
179 | CONFIG_POWER_RESET_IMX=y | ||
180 | CONFIG_POWER_RESET_SYSCON=y | ||
166 | CONFIG_SENSORS_GPIO_FAN=y | 181 | CONFIG_SENSORS_GPIO_FAN=y |
167 | CONFIG_THERMAL=y | 182 | CONFIG_THERMAL=y |
168 | CONFIG_CPU_THERMAL=y | 183 | CONFIG_CPU_THERMAL=y |
169 | CONFIG_IMX_THERMAL=y | 184 | CONFIG_IMX_THERMAL=y |
170 | CONFIG_POWER_SUPPLY=y | ||
171 | CONFIG_POWER_RESET=y | ||
172 | CONFIG_POWER_RESET_IMX=y | ||
173 | CONFIG_WATCHDOG=y | 185 | CONFIG_WATCHDOG=y |
174 | CONFIG_IMX2_WDT=y | 186 | CONFIG_IMX2_WDT=y |
175 | CONFIG_MFD_DA9052_I2C=y | 187 | CONFIG_MFD_DA9052_I2C=y |
@@ -189,6 +201,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y | |||
189 | CONFIG_MEDIA_RC_SUPPORT=y | 201 | CONFIG_MEDIA_RC_SUPPORT=y |
190 | CONFIG_RC_DEVICES=y | 202 | CONFIG_RC_DEVICES=y |
191 | CONFIG_IR_GPIO_CIR=y | 203 | CONFIG_IR_GPIO_CIR=y |
204 | CONFIG_MEDIA_USB_SUPPORT=y | ||
205 | CONFIG_USB_VIDEO_CLASS=m | ||
192 | CONFIG_V4L_PLATFORM_DRIVERS=y | 206 | CONFIG_V4L_PLATFORM_DRIVERS=y |
193 | CONFIG_SOC_CAMERA=y | 207 | CONFIG_SOC_CAMERA=y |
194 | CONFIG_VIDEO_MX3=y | 208 | CONFIG_VIDEO_MX3=y |
@@ -198,7 +212,13 @@ CONFIG_SOC_CAMERA_OV2640=y | |||
198 | CONFIG_IMX_IPUV3_CORE=y | 212 | CONFIG_IMX_IPUV3_CORE=y |
199 | CONFIG_DRM=y | 213 | CONFIG_DRM=y |
200 | CONFIG_DRM_PANEL_SIMPLE=y | 214 | CONFIG_DRM_PANEL_SIMPLE=y |
201 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 215 | CONFIG_DRM_IMX=y |
216 | CONFIG_DRM_IMX_FB_HELPER=y | ||
217 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | ||
218 | CONFIG_DRM_IMX_TVE=y | ||
219 | CONFIG_DRM_IMX_LDB=y | ||
220 | CONFIG_DRM_IMX_HDMI=y | ||
221 | CONFIG_FB_MXS=y | ||
202 | CONFIG_LCD_CLASS_DEVICE=y | 222 | CONFIG_LCD_CLASS_DEVICE=y |
203 | CONFIG_LCD_L4F00242T03=y | 223 | CONFIG_LCD_L4F00242T03=y |
204 | CONFIG_LCD_PLATFORM=y | 224 | CONFIG_LCD_PLATFORM=y |
@@ -208,6 +228,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y | |||
208 | CONFIG_LOGO=y | 228 | CONFIG_LOGO=y |
209 | CONFIG_SOUND=y | 229 | CONFIG_SOUND=y |
210 | CONFIG_SND=y | 230 | CONFIG_SND=y |
231 | CONFIG_SND_USB_AUDIO=m | ||
211 | CONFIG_SND_SOC=y | 232 | CONFIG_SND_SOC=y |
212 | CONFIG_SND_SOC_FSL_SAI=y | 233 | CONFIG_SND_SOC_FSL_SAI=y |
213 | CONFIG_SND_IMX_SOC=y | 234 | CONFIG_SND_IMX_SOC=y |
@@ -226,11 +247,32 @@ CONFIG_USB_STORAGE=y | |||
226 | CONFIG_USB_CHIPIDEA=y | 247 | CONFIG_USB_CHIPIDEA=y |
227 | CONFIG_USB_CHIPIDEA_UDC=y | 248 | CONFIG_USB_CHIPIDEA_UDC=y |
228 | CONFIG_USB_CHIPIDEA_HOST=y | 249 | CONFIG_USB_CHIPIDEA_HOST=y |
250 | CONFIG_USB_SERIAL=m | ||
251 | CONFIG_USB_SERIAL_GENERIC=y | ||
252 | CONFIG_USB_SERIAL_FTDI_SIO=m | ||
253 | CONFIG_USB_SERIAL_OPTION=m | ||
254 | CONFIG_USB_EHSET_TEST_FIXTURE=m | ||
229 | CONFIG_NOP_USB_XCEIV=y | 255 | CONFIG_NOP_USB_XCEIV=y |
230 | CONFIG_USB_MXS_PHY=y | 256 | CONFIG_USB_MXS_PHY=y |
231 | CONFIG_USB_GADGET=y | 257 | CONFIG_USB_GADGET=y |
258 | CONFIG_USB_CONFIGFS=m | ||
259 | CONFIG_USB_CONFIGFS_SERIAL=y | ||
260 | CONFIG_USB_CONFIGFS_ACM=y | ||
261 | CONFIG_USB_CONFIGFS_OBEX=y | ||
262 | CONFIG_USB_CONFIGFS_NCM=y | ||
263 | CONFIG_USB_CONFIGFS_ECM=y | ||
264 | CONFIG_USB_CONFIGFS_ECM_SUBSET=y | ||
265 | CONFIG_USB_CONFIGFS_RNDIS=y | ||
266 | CONFIG_USB_CONFIGFS_EEM=y | ||
267 | CONFIG_USB_CONFIGFS_MASS_STORAGE=y | ||
268 | CONFIG_USB_CONFIGFS_F_LB_SS=y | ||
269 | CONFIG_USB_CONFIGFS_F_FS=y | ||
270 | CONFIG_USB_ZERO=m | ||
232 | CONFIG_USB_ETH=m | 271 | CONFIG_USB_ETH=m |
272 | CONFIG_USB_G_NCM=m | ||
273 | CONFIG_USB_GADGETFS=m | ||
233 | CONFIG_USB_MASS_STORAGE=m | 274 | CONFIG_USB_MASS_STORAGE=m |
275 | CONFIG_USB_G_SERIAL=m | ||
234 | CONFIG_MMC=y | 276 | CONFIG_MMC=y |
235 | CONFIG_MMC_SDHCI=y | 277 | CONFIG_MMC_SDHCI=y |
236 | CONFIG_MMC_SDHCI_PLTFM=y | 278 | CONFIG_MMC_SDHCI_PLTFM=y |
@@ -257,13 +299,6 @@ CONFIG_IMX_SDMA=y | |||
257 | CONFIG_MXS_DMA=y | 299 | CONFIG_MXS_DMA=y |
258 | CONFIG_FSL_EDMA=y | 300 | CONFIG_FSL_EDMA=y |
259 | CONFIG_STAGING=y | 301 | CONFIG_STAGING=y |
260 | CONFIG_DRM_IMX=y | ||
261 | CONFIG_DRM_IMX_FB_HELPER=y | ||
262 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | ||
263 | CONFIG_DRM_IMX_TVE=y | ||
264 | CONFIG_DRM_IMX_LDB=y | ||
265 | CONFIG_DRM_IMX_IPUV3=y | ||
266 | CONFIG_DRM_IMX_HDMI=y | ||
267 | # CONFIG_IOMMU_SUPPORT is not set | 302 | # CONFIG_IOMMU_SUPPORT is not set |
268 | CONFIG_PWM=y | 303 | CONFIG_PWM=y |
269 | CONFIG_PWM_IMX=y | 304 | CONFIG_PWM_IMX=y |
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index 0a77f6d..b47e7c6 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig | |||
@@ -120,7 +120,6 @@ CONFIG_USB_GADGET=y | |||
120 | CONFIG_USB_ETH=m | 120 | CONFIG_USB_ETH=m |
121 | CONFIG_USB_MASS_STORAGE=m | 121 | CONFIG_USB_MASS_STORAGE=m |
122 | CONFIG_MMC=y | 122 | CONFIG_MMC=y |
123 | CONFIG_MMC_UNSAFE_RESUME=y | ||
124 | CONFIG_MMC_MXS=y | 123 | CONFIG_MMC_MXS=y |
125 | CONFIG_NEW_LEDS=y | 124 | CONFIG_NEW_LEDS=y |
126 | CONFIG_LEDS_CLASS=y | 125 | CONFIG_LEDS_CLASS=y |
@@ -150,9 +149,9 @@ CONFIG_EXT4_FS=y | |||
150 | CONFIG_FSCACHE=m | 149 | CONFIG_FSCACHE=m |
151 | CONFIG_FSCACHE_STATS=y | 150 | CONFIG_FSCACHE_STATS=y |
152 | CONFIG_CACHEFILES=m | 151 | CONFIG_CACHEFILES=m |
152 | CONFIG_VFAT_FS=y | ||
153 | CONFIG_TMPFS=y | 153 | CONFIG_TMPFS=y |
154 | CONFIG_TMPFS_POSIX_ACL=y | 154 | CONFIG_TMPFS_POSIX_ACL=y |
155 | CONFIG_VFAT_FS=y | ||
156 | CONFIG_JFFS2_FS=y | 155 | CONFIG_JFFS2_FS=y |
157 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | 156 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y |
158 | CONFIG_JFFS2_LZO=y | 157 | CONFIG_JFFS2_LZO=y |
diff --git a/recipes-kernel/linux/linux-fslc_3.19.bb b/recipes-kernel/linux/linux-fslc_4.0.bb index e44acba..208d531 100644 --- a/recipes-kernel/linux/linux-fslc_3.19.bb +++ b/recipes-kernel/linux/linux-fslc_4.0.bb | |||
@@ -9,9 +9,9 @@ upstreaming." | |||
9 | 9 | ||
10 | include linux-fslc.inc | 10 | include linux-fslc.inc |
11 | 11 | ||
12 | PV = "3.19+git${SRCPV}" | 12 | PV = "4.0+git${SRCPV}" |
13 | 13 | ||
14 | SRCBRANCH = "patches-3.19" | 14 | SRCBRANCH = "patches-4.0" |
15 | SRCREV = "5fdbf2af0ad0e2f86210f1e9bc61dcbccb79aa73" | 15 | SRCREV = "48dfc7ce6933a593a651e8ce029cbc5bcca19382" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" | 17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" |