From 94cc8666c3600dfeec193f92cfe47165a8038f8d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 6 Jul 2015 14:01:58 -0300 Subject: [PATCH] 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 Signed-off-by: Otavio Salvador --- meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig | 3 ++- .../linux/{linux-fslc_4.0.bb => linux-fslc_4.1.bb} | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename meta-fsl-arm/recipes-kernel/linux/{linux-fslc_4.0.bb => linux-fslc_4.1.bb} (85%) 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 CONFIG_CAN_FLEXCAN=y CONFIG_BT=y CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_H4=y CONFIG_CFG80211=y CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=y @@ -173,6 +173,7 @@ CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_MC9S08DZ60=y +CONFIG_GPIO_PCA953X=y CONFIG_GPIO_STMPE=y CONFIG_POWER_SUPPLY=y 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 similarity index 85% rename from meta-fsl-arm/recipes-kernel/linux/linux-fslc_4.0.bb rename to 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." include linux-fslc.inc -PV = "4.0+git${SRCPV}" +PV = "4.1+git${SRCPV}" -SRCBRANCH = "patches-4.0" -SRCREV = "4eb30aed4b7a0089b217c1647bd81a83fd928bc9" +SRCBRANCH = "patches-4.1" +SRCREV = "665a389b8e62c444969ac65e3e0eda5d8c13ea24" COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" -- 2.40.1