diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_3.18.bb (renamed from recipes-kernel/linux/linux-fslc_3.17.bb) | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 16cfec4..6790f1b 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -32,8 +32,8 @@ CONFIG_MACH_IMX35_DT=y | |||
32 | CONFIG_MACH_PCM043=y | 32 | CONFIG_MACH_PCM043=y |
33 | CONFIG_MACH_MX35_3DS=y | 33 | CONFIG_MACH_MX35_3DS=y |
34 | CONFIG_MACH_VPR200=y | 34 | CONFIG_MACH_VPR200=y |
35 | CONFIG_SOC_IMX51=y | ||
36 | CONFIG_SOC_IMX50=y | 35 | CONFIG_SOC_IMX50=y |
36 | CONFIG_SOC_IMX51=y | ||
37 | CONFIG_SOC_IMX53=y | 37 | CONFIG_SOC_IMX53=y |
38 | CONFIG_SOC_IMX6Q=y | 38 | CONFIG_SOC_IMX6Q=y |
39 | CONFIG_SOC_IMX6SL=y | 39 | CONFIG_SOC_IMX6SL=y |
@@ -105,7 +105,6 @@ CONFIG_EEPROM_AT24=y | |||
105 | CONFIG_EEPROM_AT25=y | 105 | CONFIG_EEPROM_AT25=y |
106 | # CONFIG_SCSI_PROC_FS is not set | 106 | # CONFIG_SCSI_PROC_FS is not set |
107 | CONFIG_BLK_DEV_SD=y | 107 | CONFIG_BLK_DEV_SD=y |
108 | CONFIG_SCSI_MULTI_LUN=y | ||
109 | CONFIG_SCSI_CONSTANTS=y | 108 | CONFIG_SCSI_CONSTANTS=y |
110 | CONFIG_SCSI_LOGGING=y | 109 | CONFIG_SCSI_LOGGING=y |
111 | CONFIG_SCSI_SCAN_ASYNC=y | 110 | CONFIG_SCSI_SCAN_ASYNC=y |
@@ -153,7 +152,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y | |||
153 | CONFIG_SERIAL_FSL_LPUART=y | 152 | CONFIG_SERIAL_FSL_LPUART=y |
154 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | 153 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y |
155 | CONFIG_HW_RANDOM=y | 154 | CONFIG_HW_RANDOM=y |
156 | CONFIG_HW_RANDOM_MXC_RNGA=y | ||
157 | # CONFIG_I2C_COMPAT is not set | 155 | # CONFIG_I2C_COMPAT is not set |
158 | CONFIG_I2C_CHARDEV=y | 156 | CONFIG_I2C_CHARDEV=y |
159 | # CONFIG_I2C_HELPER_AUTO is not set | 157 | # CONFIG_I2C_HELPER_AUTO is not set |
@@ -198,7 +196,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
198 | CONFIG_LCD_CLASS_DEVICE=y | 196 | CONFIG_LCD_CLASS_DEVICE=y |
199 | CONFIG_LCD_L4F00242T03=y | 197 | CONFIG_LCD_L4F00242T03=y |
200 | CONFIG_LCD_PLATFORM=y | 198 | CONFIG_LCD_PLATFORM=y |
201 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
202 | CONFIG_BACKLIGHT_PWM=y | 199 | CONFIG_BACKLIGHT_PWM=y |
203 | CONFIG_BACKLIGHT_GPIO=y | 200 | CONFIG_BACKLIGHT_GPIO=y |
204 | CONFIG_FRAMEBUFFER_CONSOLE=y | 201 | CONFIG_FRAMEBUFFER_CONSOLE=y |
@@ -206,6 +203,7 @@ CONFIG_LOGO=y | |||
206 | CONFIG_SOUND=y | 203 | CONFIG_SOUND=y |
207 | CONFIG_SND=y | 204 | CONFIG_SND=y |
208 | CONFIG_SND_SOC=y | 205 | CONFIG_SND_SOC=y |
206 | CONFIG_SND_SOC_FSL_SAI=y | ||
209 | CONFIG_SND_IMX_SOC=y | 207 | CONFIG_SND_IMX_SOC=y |
210 | CONFIG_SND_SOC_PHYCORE_AC97=y | 208 | CONFIG_SND_SOC_PHYCORE_AC97=y |
211 | CONFIG_SND_SOC_EUKREA_TLV320=y | 209 | CONFIG_SND_SOC_EUKREA_TLV320=y |
@@ -213,6 +211,7 @@ CONFIG_SND_SOC_IMX_WM8962=y | |||
213 | CONFIG_SND_SOC_IMX_SGTL5000=y | 211 | CONFIG_SND_SOC_IMX_SGTL5000=y |
214 | CONFIG_SND_SOC_IMX_SPDIF=y | 212 | CONFIG_SND_SOC_IMX_SPDIF=y |
215 | CONFIG_SND_SOC_IMX_MC13783=y | 213 | CONFIG_SND_SOC_IMX_MC13783=y |
214 | CONFIG_SND_SIMPLE_CARD=y | ||
216 | CONFIG_USB=y | 215 | CONFIG_USB=y |
217 | CONFIG_USB_EHCI_HCD=y | 216 | CONFIG_USB_EHCI_HCD=y |
218 | CONFIG_USB_EHCI_MXC=y | 217 | CONFIG_USB_EHCI_MXC=y |
@@ -240,6 +239,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y | |||
240 | CONFIG_LEDS_TRIGGER_GPIO=y | 239 | CONFIG_LEDS_TRIGGER_GPIO=y |
241 | CONFIG_RTC_CLASS=y | 240 | CONFIG_RTC_CLASS=y |
242 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 241 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
242 | CONFIG_RTC_DRV_ISL1208=y | ||
243 | CONFIG_RTC_DRV_PCF8563=y | 243 | CONFIG_RTC_DRV_PCF8563=y |
244 | CONFIG_RTC_DRV_MC13XXX=y | 244 | CONFIG_RTC_DRV_MC13XXX=y |
245 | CONFIG_RTC_DRV_MXC=y | 245 | CONFIG_RTC_DRV_MXC=y |
@@ -254,7 +254,6 @@ CONFIG_DRM_IMX_FB_HELPER=y | |||
254 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | 254 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y |
255 | CONFIG_DRM_IMX_TVE=y | 255 | CONFIG_DRM_IMX_TVE=y |
256 | CONFIG_DRM_IMX_LDB=y | 256 | CONFIG_DRM_IMX_LDB=y |
257 | CONFIG_DRM_IMX_IPUV3_CORE=y | ||
258 | CONFIG_DRM_IMX_IPUV3=y | 257 | CONFIG_DRM_IMX_IPUV3=y |
259 | CONFIG_DRM_IMX_HDMI=y | 258 | CONFIG_DRM_IMX_HDMI=y |
260 | # CONFIG_IOMMU_SUPPORT is not set | 259 | # CONFIG_IOMMU_SUPPORT is not set |
diff --git a/recipes-kernel/linux/linux-fslc_3.17.bb b/recipes-kernel/linux/linux-fslc_3.18.bb index 9e92583..01b2b5c 100644 --- a/recipes-kernel/linux/linux-fslc_3.17.bb +++ b/recipes-kernel/linux/linux-fslc_3.18.bb | |||
@@ -9,9 +9,9 @@ upstreaming." | |||
9 | 9 | ||
10 | include linux-fslc.inc | 10 | include linux-fslc.inc |
11 | 11 | ||
12 | PV = "3.17+git${SRCPV}" | 12 | PV = "3.18+git${SRCPV}" |
13 | 13 | ||
14 | SRCBRANCH = "patches-3.17" | 14 | SRCBRANCH = "patches-3.18" |
15 | SRCREV = "783addbf539885513b81a080d49d2d929ed83075" | 15 | SRCREV = "b2776bf7149bddd1f4161f14f79520f17fc1d71d" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" | 17 | COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" |