From bf52408b24f0ee75bfd8bca68e57e850b5a2a9c8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 25 Feb 2015 14:33:58 -0300 Subject: [PATCH] linux-fslc: Update to the 3.19 based version The release is based on v3.19 tag and the following commits: 5fdbf2a ARM: dts: warp: Add initial WaRP Board support Change-Id: I8f2f0e7b66a80dc071ab31d9c8293ea8d13c3d7e Signed-off-by: Otavio Salvador --- .../recipes-kernel/linux/linux-fslc/defconfig | 12 ++++++++++-- .../linux/{linux-fslc_3.18.bb => linux-fslc_3.19.bb} | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) rename meta-fsl-arm/recipes-kernel/linux/{linux-fslc_3.18.bb => linux-fslc_3.19.bb} (84%) diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig index 6790f1b3..7c2075a0 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig @@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=m -CONFIG_PM_RUNTIME=y +CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_PM_TEST_SUSPEND=y CONFIG_NET=y @@ -163,7 +163,13 @@ CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_MC9S08DZ60=y CONFIG_GPIO_STMPE=y -# CONFIG_HWMON is not set +CONFIG_SENSORS_GPIO_FAN=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_IMX_THERMAL=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_IMX=y CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_MFD_DA9052_I2C=y @@ -211,6 +217,7 @@ CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_MC13783=y +CONFIG_SND_SOC_TLV320AIC3X=y CONFIG_SND_SIMPLE_CARD=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y @@ -239,6 +246,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_ISL1208=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_MC13XXX=y diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb similarity index 84% rename from meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb rename to meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb index dc246319..e44acba5 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb @@ -9,9 +9,9 @@ upstreaming." include linux-fslc.inc -PV = "3.18+git${SRCPV}" +PV = "3.19+git${SRCPV}" -SRCBRANCH = "patches-3.18" -SRCREV = "483412c9dfc95744f59bb1dd5cfe416872d9cb9f" +SRCBRANCH = "patches-3.19" +SRCREV = "5fdbf2af0ad0e2f86210f1e9bc61dcbccb79aa73" COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" -- 2.40.1