From bf52408b24f0ee75bfd8bca68e57e850b5a2a9c8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 25 Feb 2015 14:33:58 -0300 Subject: 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 --- meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig | 12 ++++++++++-- meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb | 17 ----------------- meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 19 deletions(-) delete mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb create mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig index 6790f1b3f..7c2075a07 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.18.bb deleted file mode 100644 index dc2463194..000000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2012-2015 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ -provide support for some backported features and fixes, or because it was applied in linux-next \ -and takes some time to become part of a stable version, or because it is not applicable for \ -upstreaming." - -include linux-fslc.inc - -PV = "3.18+git${SRCPV}" - -SRCBRANCH = "patches-3.18" -SRCREV = "483412c9dfc95744f59bb1dd5cfe416872d9cb9f" - -COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb new file mode 100644 index 000000000..e44acba56 --- /dev/null +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.19.bb @@ -0,0 +1,17 @@ +# Copyright (C) 2012-2015 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" +DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ +provide support for some backported features and fixes, or because it was applied in linux-next \ +and takes some time to become part of a stable version, or because it is not applicable for \ +upstreaming." + +include linux-fslc.inc + +PV = "3.19+git${SRCPV}" + +SRCBRANCH = "patches-3.19" +SRCREV = "5fdbf2af0ad0e2f86210f1e9bc61dcbccb79aa73" + +COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" -- cgit v1.2.3-54-g00ecf