diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-07 10:04:30 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-11 16:28:49 -0300 |
commit | b65af066ef113b63c00442867c46685540fde902 (patch) | |
tree | c0c199a2d78001e5e5c12f25ede54376be1c2eb5 /recipes-kernel | |
parent | ca39f9534da9477e332700c56ace89a7ca1783db (diff) | |
download | meta-freescale-b65af066ef113b63c00442867c46685540fde902.tar.gz |
linux-fslc: Upgrade to 4.17-based fork
This upgrades the kernel to the 4.17-based fork. Following changes are
applied on top of v4.17 tag:
0a883adda1ba fec: Add disable_giga parameter to force 10/100 operation
cfc84d295839 MA-7633-2 [Android-Reboot]reboot to fastboot\recovery mode
6bbb0bc16daa ARM: imx: add cpu_is_imx6() routine
Change-Id: I5791003cd9e80ba263e1d5685d5e95aa9e8a9ed6
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 31 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mx25/defconfig | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mxs/defconfig | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_4.14.bb | 17 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_4.17.bb (renamed from recipes-kernel/linux/linux-fslc_4.9.bb) | 10 |
5 files changed, 33 insertions, 37 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 3ac47dc4..3b68a8af 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -48,17 +48,17 @@ CONFIG_PCI_IMX6=y | |||
48 | CONFIG_SMP=y | 48 | CONFIG_SMP=y |
49 | CONFIG_ARM_PSCI=y | 49 | CONFIG_ARM_PSCI=y |
50 | CONFIG_PREEMPT_VOLUNTARY=y | 50 | CONFIG_PREEMPT_VOLUNTARY=y |
51 | CONFIG_AEABI=y | ||
52 | CONFIG_HIGHMEM=y | 51 | CONFIG_HIGHMEM=y |
53 | CONFIG_CMA=y | ||
54 | CONFIG_FORCE_MAX_ZONEORDER=14 | 52 | CONFIG_FORCE_MAX_ZONEORDER=14 |
55 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" | 53 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" |
56 | CONFIG_KEXEC=y | 54 | CONFIG_KEXEC=y |
57 | CONFIG_CPU_FREQ=y | 55 | CONFIG_CPU_FREQ=y |
56 | CONFIG_CPU_FREQ_STAT=y | ||
58 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 57 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
59 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y | 58 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y |
60 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 59 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
61 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 60 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
61 | CONFIG_CPUFREQ_DT=y | ||
62 | CONFIG_ARM_IMX6Q_CPUFREQ=y | 62 | CONFIG_ARM_IMX6Q_CPUFREQ=y |
63 | CONFIG_CPU_IDLE=y | 63 | CONFIG_CPU_IDLE=y |
64 | CONFIG_VFP=y | 64 | CONFIG_VFP=y |
@@ -81,6 +81,7 @@ CONFIG_CAN_FLEXCAN=y | |||
81 | CONFIG_BT=y | 81 | CONFIG_BT=y |
82 | CONFIG_BT_HCIUART=y | 82 | CONFIG_BT_HCIUART=y |
83 | CONFIG_BT_HCIUART_H4=y | 83 | CONFIG_BT_HCIUART_H4=y |
84 | CONFIG_BT_HCIUART_LL=y | ||
84 | CONFIG_CFG80211=y | 85 | CONFIG_CFG80211=y |
85 | CONFIG_CFG80211_WEXT=y | 86 | CONFIG_CFG80211_WEXT=y |
86 | CONFIG_MAC80211=y | 87 | CONFIG_MAC80211=y |
@@ -89,7 +90,6 @@ CONFIG_RFKILL_INPUT=y | |||
89 | CONFIG_DEVTMPFS=y | 90 | CONFIG_DEVTMPFS=y |
90 | CONFIG_DEVTMPFS_MOUNT=y | 91 | CONFIG_DEVTMPFS_MOUNT=y |
91 | # CONFIG_STANDALONE is not set | 92 | # CONFIG_STANDALONE is not set |
92 | CONFIG_DMA_CMA=y | ||
93 | CONFIG_CMA_SIZE_MBYTES=64 | 93 | CONFIG_CMA_SIZE_MBYTES=64 |
94 | CONFIG_IMX_WEIM=y | 94 | CONFIG_IMX_WEIM=y |
95 | CONFIG_CONNECTOR=y | 95 | CONFIG_CONNECTOR=y |
@@ -154,6 +154,7 @@ CONFIG_USB_USBNET=y | |||
154 | CONFIG_USB_NET_CDC_EEM=m | 154 | CONFIG_USB_NET_CDC_EEM=m |
155 | CONFIG_BRCMFMAC=m | 155 | CONFIG_BRCMFMAC=m |
156 | CONFIG_WL12XX=m | 156 | CONFIG_WL12XX=m |
157 | CONFIG_WL18XX=m | ||
157 | CONFIG_WLCORE_SDIO=m | 158 | CONFIG_WLCORE_SDIO=m |
158 | # CONFIG_WILINK_PLATFORM_DATA is not set | 159 | # CONFIG_WILINK_PLATFORM_DATA is not set |
159 | CONFIG_INPUT_EVDEV=y | 160 | CONFIG_INPUT_EVDEV=y |
@@ -182,6 +183,7 @@ CONFIG_SERIAL_IMX=y | |||
182 | CONFIG_SERIAL_IMX_CONSOLE=y | 183 | CONFIG_SERIAL_IMX_CONSOLE=y |
183 | CONFIG_SERIAL_FSL_LPUART=y | 184 | CONFIG_SERIAL_FSL_LPUART=y |
184 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | 185 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y |
186 | CONFIG_SERIAL_DEV_BUS=y | ||
185 | # CONFIG_I2C_COMPAT is not set | 187 | # CONFIG_I2C_COMPAT is not set |
186 | CONFIG_I2C_CHARDEV=y | 188 | CONFIG_I2C_CHARDEV=y |
187 | CONFIG_I2C_MUX=y | 189 | CONFIG_I2C_MUX=y |
@@ -201,19 +203,19 @@ CONFIG_GPIO_PCA953X=y | |||
201 | CONFIG_GPIO_STMPE=y | 203 | CONFIG_GPIO_STMPE=y |
202 | CONFIG_GPIO_74X164=y | 204 | CONFIG_GPIO_74X164=y |
203 | CONFIG_POWER_RESET=y | 205 | CONFIG_POWER_RESET=y |
204 | CONFIG_POWER_RESET_IMX=y | ||
205 | CONFIG_POWER_RESET_SYSCON=y | 206 | CONFIG_POWER_RESET_SYSCON=y |
206 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y | 207 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y |
207 | CONFIG_POWER_SUPPLY=y | 208 | CONFIG_POWER_SUPPLY=y |
208 | CONFIG_SENSORS_GPIO_FAN=y | 209 | CONFIG_SENSORS_GPIO_FAN=y |
209 | CONFIG_SENSORS_IIO_HWMON=y | 210 | CONFIG_SENSORS_IIO_HWMON=y |
210 | CONFIG_THERMAL=y | ||
211 | CONFIG_THERMAL_WRITABLE_TRIPS=y | 211 | CONFIG_THERMAL_WRITABLE_TRIPS=y |
212 | CONFIG_CPU_THERMAL=y | 212 | CONFIG_CPU_THERMAL=y |
213 | CONFIG_IMX_THERMAL=y | 213 | CONFIG_IMX_THERMAL=y |
214 | CONFIG_WATCHDOG=y | 214 | CONFIG_WATCHDOG=y |
215 | CONFIG_DA9062_WATCHDOG=y | ||
215 | CONFIG_IMX2_WDT=y | 216 | CONFIG_IMX2_WDT=y |
216 | CONFIG_MFD_DA9052_I2C=y | 217 | CONFIG_MFD_DA9052_I2C=y |
218 | CONFIG_MFD_DA9062=y | ||
217 | CONFIG_MFD_MC13XXX_SPI=y | 219 | CONFIG_MFD_MC13XXX_SPI=y |
218 | CONFIG_MFD_MC13XXX_I2C=y | 220 | CONFIG_MFD_MC13XXX_I2C=y |
219 | CONFIG_MFD_STMPE=y | 221 | CONFIG_MFD_STMPE=y |
@@ -221,17 +223,18 @@ CONFIG_REGULATOR=y | |||
221 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 223 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
222 | CONFIG_REGULATOR_ANATOP=y | 224 | CONFIG_REGULATOR_ANATOP=y |
223 | CONFIG_REGULATOR_DA9052=y | 225 | CONFIG_REGULATOR_DA9052=y |
226 | CONFIG_REGULATOR_DA9062=y | ||
224 | CONFIG_REGULATOR_GPIO=y | 227 | CONFIG_REGULATOR_GPIO=y |
225 | CONFIG_REGULATOR_MC13783=y | 228 | CONFIG_REGULATOR_MC13783=y |
226 | CONFIG_REGULATOR_MC13892=y | 229 | CONFIG_REGULATOR_MC13892=y |
227 | CONFIG_REGULATOR_PFUZE100=y | 230 | CONFIG_REGULATOR_PFUZE100=y |
231 | CONFIG_RC_CORE=y | ||
232 | CONFIG_RC_DEVICES=y | ||
233 | CONFIG_IR_GPIO_CIR=y | ||
228 | CONFIG_MEDIA_SUPPORT=y | 234 | CONFIG_MEDIA_SUPPORT=y |
229 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 235 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
230 | CONFIG_MEDIA_RC_SUPPORT=y | ||
231 | CONFIG_MEDIA_CONTROLLER=y | 236 | CONFIG_MEDIA_CONTROLLER=y |
232 | CONFIG_VIDEO_V4L2_SUBDEV_API=y | 237 | CONFIG_VIDEO_V4L2_SUBDEV_API=y |
233 | CONFIG_RC_DEVICES=y | ||
234 | CONFIG_IR_GPIO_CIR=y | ||
235 | CONFIG_MEDIA_USB_SUPPORT=y | 238 | CONFIG_MEDIA_USB_SUPPORT=y |
236 | CONFIG_USB_VIDEO_CLASS=m | 239 | CONFIG_USB_VIDEO_CLASS=m |
237 | CONFIG_V4L_PLATFORM_DRIVERS=y | 240 | CONFIG_V4L_PLATFORM_DRIVERS=y |
@@ -244,8 +247,10 @@ CONFIG_VIDEO_ADV7180=m | |||
244 | CONFIG_VIDEO_OV5640=m | 247 | CONFIG_VIDEO_OV5640=m |
245 | CONFIG_IMX_IPUV3_CORE=y | 248 | CONFIG_IMX_IPUV3_CORE=y |
246 | CONFIG_DRM=y | 249 | CONFIG_DRM=y |
250 | CONFIG_DRM_PANEL_LVDS=y | ||
247 | CONFIG_DRM_PANEL_SIMPLE=y | 251 | CONFIG_DRM_PANEL_SIMPLE=y |
248 | CONFIG_DRM_DW_HDMI_AHB_AUDIO=m | 252 | CONFIG_DRM_DW_HDMI_AHB_AUDIO=m |
253 | CONFIG_DRM_DW_HDMI_CEC=y | ||
249 | CONFIG_DRM_IMX=y | 254 | CONFIG_DRM_IMX=y |
250 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | 255 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y |
251 | CONFIG_DRM_IMX_TVE=y | 256 | CONFIG_DRM_IMX_TVE=y |
@@ -274,9 +279,11 @@ CONFIG_SND_SOC_IMX_SGTL5000=y | |||
274 | CONFIG_SND_SOC_IMX_SPDIF=y | 279 | CONFIG_SND_SOC_IMX_SPDIF=y |
275 | CONFIG_SND_SOC_IMX_MC13783=y | 280 | CONFIG_SND_SOC_IMX_MC13783=y |
276 | CONFIG_SND_SOC_FSL_ASOC_CARD=y | 281 | CONFIG_SND_SOC_FSL_ASOC_CARD=y |
282 | CONFIG_SND_SOC_AC97_CODEC=y | ||
277 | CONFIG_SND_SOC_CS42XX8_I2C=y | 283 | CONFIG_SND_SOC_CS42XX8_I2C=y |
278 | CONFIG_SND_SOC_TLV320AIC3X=y | 284 | CONFIG_SND_SOC_TLV320AIC3X=y |
279 | CONFIG_SND_SOC_WM8960=y | 285 | CONFIG_SND_SOC_WM8960=y |
286 | CONFIG_SND_SOC_WM8962=y | ||
280 | CONFIG_SND_SIMPLE_CARD=y | 287 | CONFIG_SND_SIMPLE_CARD=y |
281 | CONFIG_HID_MULTITOUCH=y | 288 | CONFIG_HID_MULTITOUCH=y |
282 | CONFIG_USB=y | 289 | CONFIG_USB=y |
@@ -336,6 +343,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y | |||
336 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 343 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
337 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y | 344 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y |
338 | CONFIG_LEDS_TRIGGER_GPIO=y | 345 | CONFIG_LEDS_TRIGGER_GPIO=y |
346 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
339 | CONFIG_RTC_CLASS=y | 347 | CONFIG_RTC_CLASS=y |
340 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 348 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
341 | CONFIG_RTC_DRV_DS1307=y | 349 | CONFIG_RTC_DRV_DS1307=y |
@@ -343,8 +351,10 @@ CONFIG_RTC_DRV_ISL1208=y | |||
343 | CONFIG_RTC_DRV_PCF8523=y | 351 | CONFIG_RTC_DRV_PCF8523=y |
344 | CONFIG_RTC_DRV_PCF8563=y | 352 | CONFIG_RTC_DRV_PCF8563=y |
345 | CONFIG_RTC_DRV_M41T80=y | 353 | CONFIG_RTC_DRV_M41T80=y |
354 | CONFIG_RTC_DRV_DA9063=y | ||
346 | CONFIG_RTC_DRV_MC13XXX=y | 355 | CONFIG_RTC_DRV_MC13XXX=y |
347 | CONFIG_RTC_DRV_MXC=y | 356 | CONFIG_RTC_DRV_MXC=y |
357 | CONFIG_RTC_DRV_MXC_V2=y | ||
348 | CONFIG_RTC_DRV_SNVS=y | 358 | CONFIG_RTC_DRV_SNVS=y |
349 | CONFIG_DMADEVICES=y | 359 | CONFIG_DMADEVICES=y |
350 | CONFIG_FSL_EDMA=y | 360 | CONFIG_FSL_EDMA=y |
@@ -357,11 +367,15 @@ CONFIG_COMMON_CLK_PWM=y | |||
357 | CONFIG_IIO=y | 367 | CONFIG_IIO=y |
358 | CONFIG_IMX7D_ADC=y | 368 | CONFIG_IMX7D_ADC=y |
359 | CONFIG_VF610_ADC=y | 369 | CONFIG_VF610_ADC=y |
370 | CONFIG_MAG3110=y | ||
360 | CONFIG_MPL3115=y | 371 | CONFIG_MPL3115=y |
361 | CONFIG_PWM=y | 372 | CONFIG_PWM=y |
362 | CONFIG_PWM_FSL_FTM=y | 373 | CONFIG_PWM_FSL_FTM=y |
363 | CONFIG_PWM_IMX=y | 374 | CONFIG_PWM_IMX=y |
364 | CONFIG_NVMEM_IMX_OCOTP=y | 375 | CONFIG_NVMEM_IMX_OCOTP=y |
376 | CONFIG_TEE=y | ||
377 | CONFIG_OPTEE=y | ||
378 | CONFIG_MUX_MMIO=y | ||
365 | CONFIG_EXT2_FS=y | 379 | CONFIG_EXT2_FS=y |
366 | CONFIG_EXT2_FS_XATTR=y | 380 | CONFIG_EXT2_FS_XATTR=y |
367 | CONFIG_EXT2_FS_POSIX_ACL=y | 381 | CONFIG_EXT2_FS_POSIX_ACL=y |
@@ -393,6 +407,7 @@ CONFIG_NLS_ISO8859_1=y | |||
393 | CONFIG_NLS_ISO8859_15=m | 407 | CONFIG_NLS_ISO8859_15=m |
394 | CONFIG_NLS_UTF8=y | 408 | CONFIG_NLS_UTF8=y |
395 | CONFIG_PRINTK_TIME=y | 409 | CONFIG_PRINTK_TIME=y |
410 | CONFIG_DEBUG_FS=y | ||
396 | CONFIG_MAGIC_SYSRQ=y | 411 | CONFIG_MAGIC_SYSRQ=y |
397 | # CONFIG_SCHED_DEBUG is not set | 412 | # CONFIG_SCHED_DEBUG is not set |
398 | CONFIG_PROVE_LOCKING=y | 413 | CONFIG_PROVE_LOCKING=y |
diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig index ca0f13ca..054591dc 100644 --- a/recipes-kernel/linux/linux-fslc/mx25/defconfig +++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | # CONFIG_SWAP is not set | 1 | # CONFIG_SWAP is not set |
2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_NO_HZ=y | 4 | CONFIG_NO_HZ=y |
6 | CONFIG_HIGH_RES_TIMERS=y | 5 | CONFIG_HIGH_RES_TIMERS=y |
7 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -78,7 +77,6 @@ CONFIG_SMC91X=y | |||
78 | CONFIG_SMC911X=y | 77 | CONFIG_SMC911X=y |
79 | CONFIG_SMSC911X=y | 78 | CONFIG_SMSC911X=y |
80 | CONFIG_SMSC_PHY=y | 79 | CONFIG_SMSC_PHY=y |
81 | # CONFIG_INPUT_MOUSEDEV is not set | ||
82 | CONFIG_INPUT_EVDEV=y | 80 | CONFIG_INPUT_EVDEV=y |
83 | CONFIG_KEYBOARD_GPIO=y | 81 | CONFIG_KEYBOARD_GPIO=y |
84 | CONFIG_KEYBOARD_IMX=y | 82 | CONFIG_KEYBOARD_IMX=y |
@@ -105,8 +103,8 @@ CONFIG_HWMON=m | |||
105 | CONFIG_SENSORS_MC13783_ADC=m | 103 | CONFIG_SENSORS_MC13783_ADC=m |
106 | CONFIG_WATCHDOG=y | 104 | CONFIG_WATCHDOG=y |
107 | CONFIG_IMX2_WDT=y | 105 | CONFIG_IMX2_WDT=y |
108 | CONFIG_MFD_MX25_TSADC=y | ||
109 | CONFIG_MFD_MC13XXX_SPI=y | 106 | CONFIG_MFD_MC13XXX_SPI=y |
107 | CONFIG_MFD_MX25_TSADC=y | ||
110 | CONFIG_REGULATOR=y | 108 | CONFIG_REGULATOR=y |
111 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 109 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
112 | CONFIG_REGULATOR_GPIO=y | 110 | CONFIG_REGULATOR_GPIO=y |
@@ -116,10 +114,8 @@ CONFIG_MEDIA_SUPPORT=y | |||
116 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 114 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
117 | CONFIG_V4L_PLATFORM_DRIVERS=y | 115 | CONFIG_V4L_PLATFORM_DRIVERS=y |
118 | CONFIG_SOC_CAMERA=y | 116 | CONFIG_SOC_CAMERA=y |
119 | CONFIG_VIDEO_MX2=y | ||
120 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 117 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
121 | CONFIG_VIDEO_CODA=y | 118 | CONFIG_VIDEO_CODA=y |
122 | CONFIG_SOC_CAMERA_OV2640=y | ||
123 | CONFIG_FB=y | 119 | CONFIG_FB=y |
124 | CONFIG_FB_IMX=y | 120 | CONFIG_FB_IMX=y |
125 | CONFIG_LCD_L4F00242T03=y | 121 | CONFIG_LCD_L4F00242T03=y |
@@ -134,8 +130,9 @@ CONFIG_SND_IMX_SOC=y | |||
134 | CONFIG_SND_SOC_MX27VIS_AIC32X4=y | 130 | CONFIG_SND_SOC_MX27VIS_AIC32X4=y |
135 | CONFIG_SND_SOC_PHYCORE_AC97=y | 131 | CONFIG_SND_SOC_PHYCORE_AC97=y |
136 | CONFIG_SND_SOC_EUKREA_TLV320=y | 132 | CONFIG_SND_SOC_EUKREA_TLV320=y |
137 | CONFIG_SND_SOC_IMX_SGTL5000=y | ||
138 | CONFIG_SND_SOC_IMX_MC13783=y | 133 | CONFIG_SND_SOC_IMX_MC13783=y |
134 | CONFIG_SND_SOC_FSL_ASOC_CARD=y | ||
135 | CONFIG_SND_SOC_SGTL5000=y | ||
139 | CONFIG_USB_HID=m | 136 | CONFIG_USB_HID=m |
140 | CONFIG_USB=y | 137 | CONFIG_USB=y |
141 | CONFIG_USB_EHCI_HCD=y | 138 | CONFIG_USB_EHCI_HCD=y |
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index 3d201c58..a508eb30 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig | |||
@@ -25,6 +25,7 @@ CONFIG_BLK_DEV_INTEGRITY=y | |||
25 | # CONFIG_IOSCHED_CFQ is not set | 25 | # CONFIG_IOSCHED_CFQ is not set |
26 | # CONFIG_ARCH_MULTI_V7 is not set | 26 | # CONFIG_ARCH_MULTI_V7 is not set |
27 | CONFIG_ARCH_MXS=y | 27 | CONFIG_ARCH_MXS=y |
28 | # CONFIG_ARM_THUMB is not set | ||
28 | CONFIG_PREEMPT_VOLUNTARY=y | 29 | CONFIG_PREEMPT_VOLUNTARY=y |
29 | CONFIG_AEABI=y | 30 | CONFIG_AEABI=y |
30 | CONFIG_NET=y | 31 | CONFIG_NET=y |
@@ -44,7 +45,6 @@ CONFIG_CAN_FLEXCAN=m | |||
44 | # CONFIG_WIRELESS is not set | 45 | # CONFIG_WIRELESS is not set |
45 | CONFIG_DEVTMPFS=y | 46 | CONFIG_DEVTMPFS=y |
46 | CONFIG_DEVTMPFS_MOUNT=y | 47 | CONFIG_DEVTMPFS_MOUNT=y |
47 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
48 | CONFIG_MTD=y | 48 | CONFIG_MTD=y |
49 | CONFIG_MTD_CMDLINE_PARTS=y | 49 | CONFIG_MTD_CMDLINE_PARTS=y |
50 | CONFIG_MTD_BLOCK=y | 50 | CONFIG_MTD_BLOCK=y |
@@ -167,6 +167,7 @@ CONFIG_FRAME_WARN=2048 | |||
167 | CONFIG_UNUSED_SYMBOLS=y | 167 | CONFIG_UNUSED_SYMBOLS=y |
168 | CONFIG_MAGIC_SYSRQ=y | 168 | CONFIG_MAGIC_SYSRQ=y |
169 | CONFIG_DEBUG_KERNEL=y | 169 | CONFIG_DEBUG_KERNEL=y |
170 | CONFIG_SOFTLOCKUP_DETECTOR=y | ||
170 | CONFIG_PROVE_LOCKING=y | 171 | CONFIG_PROVE_LOCKING=y |
171 | CONFIG_BLK_DEV_IO_TRACE=y | 172 | CONFIG_BLK_DEV_IO_TRACE=y |
172 | CONFIG_STRICT_DEVMEM=y | 173 | CONFIG_STRICT_DEVMEM=y |
diff --git a/recipes-kernel/linux/linux-fslc_4.14.bb b/recipes-kernel/linux/linux-fslc_4.14.bb deleted file mode 100644 index 63ecb9c5..00000000 --- a/recipes-kernel/linux/linux-fslc_4.14.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | # Copyright (C) 2012-2017 O.S. Systems Software LTDA. | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" | ||
5 | DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ | ||
6 | provide support for some backported features and fixes, or because it was applied in linux-next \ | ||
7 | and takes some time to become part of a stable version, or because it is not applicable for \ | ||
8 | upstreaming." | ||
9 | |||
10 | include linux-fslc.inc | ||
11 | |||
12 | PV = "4.14+git${SRCPV}" | ||
13 | |||
14 | SRCBRANCH = "4.14.x+fslc" | ||
15 | SRCREV = "a4f7f0ac8250ff10d6111df25e7d940a2f36801a" | ||
16 | |||
17 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | ||
diff --git a/recipes-kernel/linux/linux-fslc_4.9.bb b/recipes-kernel/linux/linux-fslc_4.17.bb index da50bfa1..be5e0f6a 100644 --- a/recipes-kernel/linux/linux-fslc_4.9.bb +++ b/recipes-kernel/linux/linux-fslc_4.17.bb | |||
@@ -7,13 +7,13 @@ provide support for some backported features and fixes, or because it was applie | |||
7 | and takes some time to become part of a stable version, or because it is not applicable for \ | 7 | and takes some time to become part of a stable version, or because it is not applicable for \ |
8 | upstreaming." | 8 | upstreaming." |
9 | 9 | ||
10 | FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-4.9:" | ||
11 | |||
12 | include linux-fslc.inc | 10 | include linux-fslc.inc |
13 | 11 | ||
14 | PV = "4.9+git${SRCPV}" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
13 | |||
14 | PV = "4.17+git${SRCPV}" | ||
15 | 15 | ||
16 | SRCBRANCH = "4.9.x+fslc" | 16 | SRCBRANCH = "4.17.x+fslc" |
17 | SRCREV = "8f876e153b255daeb60833296d5ab213537f36a1" | 17 | SRCREV = "0a883adda1ba8bb1312136ce6d9cd7d54340bfbd" |
18 | 18 | ||
19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |