From 5b1b095a423b84829d5fad7579cd17e56301f5d2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 8 Dec 2014 11:15:50 -0200 Subject: [PATCH] linux-fslc: Update to 3.18 release This updates the Linux kernel to the 3.18 release. There are currently no changes on top of it. Signed-off-by: Otavio Salvador --- meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig | 9 ++++----- .../linux/{linux-fslc_3.17.bb => linux-fslc_3.18.bb} | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta-fsl-arm/recipes-kernel/linux/{linux-fslc_3.17.bb => linux-fslc_3.18.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 16cfec43..6790f1b3 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc/defconfig @@ -32,8 +32,8 @@ CONFIG_MACH_IMX35_DT=y CONFIG_MACH_PCM043=y CONFIG_MACH_MX35_3DS=y CONFIG_MACH_VPR200=y -CONFIG_SOC_IMX51=y CONFIG_SOC_IMX50=y +CONFIG_SOC_IMX51=y CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y @@ -105,7 +105,6 @@ CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y @@ -153,7 +152,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MXC_RNGA=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set @@ -198,7 +196,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y CONFIG_LCD_PLATFORM=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_GPIO=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -206,6 +203,7 @@ CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y +CONFIG_SND_SOC_FSL_SAI=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_EUKREA_TLV320=y @@ -213,6 +211,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_SIMPLE_CARD=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MXC=y @@ -240,6 +239,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_ISL1208=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y @@ -254,7 +254,6 @@ CONFIG_DRM_IMX_FB_HELPER=y CONFIG_DRM_IMX_PARALLEL_DISPLAY=y CONFIG_DRM_IMX_TVE=y CONFIG_DRM_IMX_LDB=y -CONFIG_DRM_IMX_IPUV3_CORE=y CONFIG_DRM_IMX_IPUV3=y CONFIG_DRM_IMX_HDMI=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.17.bb b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb similarity index 84% rename from meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.17.bb rename to meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb index 9e925832..01b2b5c1 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.17.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-fslc_3.18.bb @@ -9,9 +9,9 @@ upstreaming." include linux-fslc.inc -PV = "3.17+git${SRCPV}" +PV = "3.18+git${SRCPV}" -SRCBRANCH = "patches-3.17" -SRCREV = "783addbf539885513b81a080d49d2d929ed83075" +SRCBRANCH = "patches-3.18" +SRCREV = "b2776bf7149bddd1f4161f14f79520f17fc1d71d" COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" -- 2.40.1