diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-07-06 14:01:58 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-07 10:16:28 -0300 |
commit | 94cc8666c3600dfeec193f92cfe47165a8038f8d (patch) | |
tree | ae7ea5de195aed02a9c3e8146fc3e1a32bb896df | |
parent | 504290d03d6d6cdd11bdd60c0986eadd683875ad (diff) | |
download | meta-freescale-94cc8666c3600dfeec193f92cfe47165a8038f8d.tar.gz |
linux-fslc: Update to a Linux kernel 4.1-based fork
Update to the revision 665a389 which is based on the 4.1.1 stable
release. It includes the following changes on top of it:
665a389 ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
7ce4321 ARM: imx_v6_v7_defconfig: Add Wireless support
209773b ARM: imx_v6_v7_defconfig: Select HCIUART_H4
5af747f ARM: dts: imx6sl-warp: Add changes for rev1.12
c057f36 ARM: dts: imx6sl-warp: Add the SD2_RESET pin
4b78c61 ARM: dts: imx6qdl-hummingboard: Add PCIe support
35d2348 ARM: dts: imx23-olinuxino: Add i2c support
1299e0b ARM: dts: imx23: Add i2c support
4ff7f5e ARM: dts: imx6qdl: move HDMI controller to right location in DT
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig | 3 | ||||
-rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.1.bb (renamed from meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.0.bb) | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig index f6989fb5..d615e3d3 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -73,7 +73,7 @@ CONFIG_CAN=y | |||
73 | CONFIG_CAN_FLEXCAN=y | 73 | CONFIG_CAN_FLEXCAN=y |
74 | CONFIG_BT=y | 74 | CONFIG_BT=y |
75 | CONFIG_BT_HCIUART=y | 75 | CONFIG_BT_HCIUART=y |
76 | CONFIG_BT_HCIUART_3WIRE=y | 76 | CONFIG_BT_HCIUART_H4=y |
77 | CONFIG_CFG80211=y | 77 | CONFIG_CFG80211=y |
78 | CONFIG_CFG80211_WEXT=y | 78 | CONFIG_CFG80211_WEXT=y |
79 | CONFIG_MAC80211=y | 79 | CONFIG_MAC80211=y |
@@ -173,6 +173,7 @@ CONFIG_SPI=y | |||
173 | CONFIG_SPI_IMX=y | 173 | CONFIG_SPI_IMX=y |
174 | CONFIG_GPIO_SYSFS=y | 174 | CONFIG_GPIO_SYSFS=y |
175 | CONFIG_GPIO_MC9S08DZ60=y | 175 | CONFIG_GPIO_MC9S08DZ60=y |
176 | CONFIG_GPIO_PCA953X=y | ||
176 | CONFIG_GPIO_STMPE=y | 177 | CONFIG_GPIO_STMPE=y |
177 | CONFIG_POWER_SUPPLY=y | 178 | CONFIG_POWER_SUPPLY=y |
178 | CONFIG_POWER_RESET=y | 179 | CONFIG_POWER_RESET=y |
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.0.bb b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.1.bb index 807dd0b1..84edf118 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.0.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.1.bb | |||
@@ -9,9 +9,9 @@ upstreaming." | |||
9 | 9 | ||
10 | include linux-fslc.inc | 10 | include linux-fslc.inc |
11 | 11 | ||
12 | PV = "4.0+git${SRCPV}" | 12 | PV = "4.1+git${SRCPV}" |
13 | 13 | ||
14 | SRCBRANCH = "patches-4.0" | 14 | SRCBRANCH = "patches-4.1" |
15 | SRCREV = "4eb30aed4b7a0089b217c1647bd81a83fd928bc9" | 15 | SRCREV = "665a389b8e62c444969ac65e3e0eda5d8c13ea24" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" | 17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" |