summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-07-06 14:01:58 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2015-07-14 09:16:02 -0300
commit3c563f73f8cc8ed44cb27b6c13ec3b98a8958ce5 (patch)
tree64aa9450c643709a03998bfb72f719c60eadc02e
parent2563ea579bc8fe3fb589bdc3238cccf38a9ea1e2 (diff)
downloadmeta-fsl-arm-3c563f73f8cc8ed44cb27b6c13ec3b98a8958ce5.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--recipes-kernel/linux/linux-fslc/defconfig3
-rw-r--r--recipes-kernel/linux/linux-fslc_4.1.bb (renamed from recipes-kernel/linux/linux-fslc_4.0.bb)6
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index f6989fb..d615e3d 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -73,7 +73,7 @@ CONFIG_CAN=y
73CONFIG_CAN_FLEXCAN=y 73CONFIG_CAN_FLEXCAN=y
74CONFIG_BT=y 74CONFIG_BT=y
75CONFIG_BT_HCIUART=y 75CONFIG_BT_HCIUART=y
76CONFIG_BT_HCIUART_3WIRE=y 76CONFIG_BT_HCIUART_H4=y
77CONFIG_CFG80211=y 77CONFIG_CFG80211=y
78CONFIG_CFG80211_WEXT=y 78CONFIG_CFG80211_WEXT=y
79CONFIG_MAC80211=y 79CONFIG_MAC80211=y
@@ -173,6 +173,7 @@ CONFIG_SPI=y
173CONFIG_SPI_IMX=y 173CONFIG_SPI_IMX=y
174CONFIG_GPIO_SYSFS=y 174CONFIG_GPIO_SYSFS=y
175CONFIG_GPIO_MC9S08DZ60=y 175CONFIG_GPIO_MC9S08DZ60=y
176CONFIG_GPIO_PCA953X=y
176CONFIG_GPIO_STMPE=y 177CONFIG_GPIO_STMPE=y
177CONFIG_POWER_SUPPLY=y 178CONFIG_POWER_SUPPLY=y
178CONFIG_POWER_RESET=y 179CONFIG_POWER_RESET=y
diff --git a/recipes-kernel/linux/linux-fslc_4.0.bb b/recipes-kernel/linux/linux-fslc_4.1.bb
index 807dd0b..84edf11 100644
--- a/recipes-kernel/linux/linux-fslc_4.0.bb
+++ b/recipes-kernel/linux/linux-fslc_4.1.bb
@@ -9,9 +9,9 @@ upstreaming."
9 9
10include linux-fslc.inc 10include linux-fslc.inc
11 11
12PV = "4.0+git${SRCPV}" 12PV = "4.1+git${SRCPV}"
13 13
14SRCBRANCH = "patches-4.0" 14SRCBRANCH = "patches-4.1"
15SRCREV = "4eb30aed4b7a0089b217c1647bd81a83fd928bc9" 15SRCREV = "665a389b8e62c444969ac65e3e0eda5d8c13ea24"
16 16
17COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" 17COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"