summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2019-03-15 17:55:19 -0300
committerFabio Berton <fabio.berton@ossystems.com.br>2019-03-22 16:52:12 -0300
commit02125de2a9b765649a7a71d18c7dbe69404450c8 (patch)
treeedda6593c0da1f35e8a066d8bce961e780e62e6b /recipes-kernel/linux
parent73a1148a808c2892192892e12e82c15ddf560551 (diff)
downloadmeta-freescale-02125de2a9b765649a7a71d18c7dbe69404450c8.tar.gz
linux-fslc: Upgrade 4.20 -> 5.0
This upgrades the Linux fork to a 5.0-based one. It forward port the patches which were still included and then has following patches applied: - 20d8efe36350 Revert "ARM: dts: imx7d-pico: Pass the Ethernet PHY reset GPIO" - 69f55e399783 ARM: dts: imx6ul-pico: Convert to DRM bindings - 385073b89f9d ARM: dts: imx7d-pico: Add LCD support - b8e79ca07f93 drm/panel: simple: Add support for VXT VL050-8048NT-C01 panel - 503b228c6dc9 dt-bindings: Add VXT VL050-8048NT-C01 panel bindings - 8c97588def29 dt-bindings: Add vendor prefix for VXT Ltd - 096f800773bd ARM: dts: imx6ul-pico-hobbit: Extend peripherals support - 24aecb0c2ee7 drivers, misc: add U-Boot bootcount driver - 0f9e1f27279b fec: Add disable_giga parameter to force 10/100 operation - 87af09aea2d4 MA-7633-2 [Android-Reboot]reboot to fastboot\recovery mode - e77beaa42b9c ARM: imx: add cpu_is_imx6() routine Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig9
-rw-r--r--recipes-kernel/linux/linux-fslc_5.0.bb (renamed from recipes-kernel/linux/linux-fslc_4.20.bb)6
2 files changed, 12 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index 6985d61e..16a7d2e4 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -38,6 +38,7 @@ CONFIG_SOC_IMX6SLL=y
38CONFIG_SOC_IMX6SX=y 38CONFIG_SOC_IMX6SX=y
39CONFIG_SOC_IMX6UL=y 39CONFIG_SOC_IMX6UL=y
40CONFIG_SOC_IMX7D=y 40CONFIG_SOC_IMX7D=y
41CONFIG_SOC_IMX7ULP=y
41CONFIG_SOC_VF610=y 42CONFIG_SOC_VF610=y
42CONFIG_PCI=y 43CONFIG_PCI=y
43CONFIG_PCI_MSI=y 44CONFIG_PCI_MSI=y
@@ -81,6 +82,7 @@ CONFIG_NETFILTER=y
81CONFIG_CAN=y 82CONFIG_CAN=y
82CONFIG_CAN_FLEXCAN=y 83CONFIG_CAN_FLEXCAN=y
83CONFIG_BT=y 84CONFIG_BT=y
85CONFIG_BT_BNEP=m
84CONFIG_BT_HCIUART=y 86CONFIG_BT_HCIUART=y
85CONFIG_BT_HCIUART_LL=y 87CONFIG_BT_HCIUART_LL=y
86CONFIG_CFG80211=y 88CONFIG_CFG80211=y
@@ -175,6 +177,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
175CONFIG_INPUT_TOUCHSCREEN=y 177CONFIG_INPUT_TOUCHSCREEN=y
176CONFIG_TOUCHSCREEN_ADS7846=y 178CONFIG_TOUCHSCREEN_ADS7846=y
177CONFIG_TOUCHSCREEN_EGALAX=y 179CONFIG_TOUCHSCREEN_EGALAX=y
180CONFIG_TOUCHSCREEN_GOODIX=y
178CONFIG_TOUCHSCREEN_MAX11801=y 181CONFIG_TOUCHSCREEN_MAX11801=y
179CONFIG_TOUCHSCREEN_IMX6UL_TSC=y 182CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
180CONFIG_TOUCHSCREEN_EDT_FT5X06=y 183CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -224,10 +227,12 @@ CONFIG_CPU_THERMAL=y
224CONFIG_IMX_THERMAL=y 227CONFIG_IMX_THERMAL=y
225CONFIG_WATCHDOG=y 228CONFIG_WATCHDOG=y
226CONFIG_DA9062_WATCHDOG=y 229CONFIG_DA9062_WATCHDOG=y
230CONFIG_DA9063_WATCHDOG=m
227CONFIG_RN5T618_WATCHDOG=y 231CONFIG_RN5T618_WATCHDOG=y
228CONFIG_IMX2_WDT=y 232CONFIG_IMX2_WDT=y
229CONFIG_MFD_DA9052_I2C=y 233CONFIG_MFD_DA9052_I2C=y
230CONFIG_MFD_DA9062=y 234CONFIG_MFD_DA9062=y
235CONFIG_MFD_DA9063=y
231CONFIG_MFD_MC13XXX_SPI=y 236CONFIG_MFD_MC13XXX_SPI=y
232CONFIG_MFD_MC13XXX_I2C=y 237CONFIG_MFD_MC13XXX_I2C=y
233CONFIG_MFD_RN5T618=y 238CONFIG_MFD_RN5T618=y
@@ -237,6 +242,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
237CONFIG_REGULATOR_ANATOP=y 242CONFIG_REGULATOR_ANATOP=y
238CONFIG_REGULATOR_DA9052=y 243CONFIG_REGULATOR_DA9052=y
239CONFIG_REGULATOR_DA9062=y 244CONFIG_REGULATOR_DA9062=y
245CONFIG_REGULATOR_DA9063=y
240CONFIG_REGULATOR_GPIO=y 246CONFIG_REGULATOR_GPIO=y
241CONFIG_REGULATOR_MC13783=y 247CONFIG_REGULATOR_MC13783=y
242CONFIG_REGULATOR_MC13892=y 248CONFIG_REGULATOR_MC13892=y
@@ -256,6 +262,7 @@ CONFIG_VIDEO_MUX=y
256CONFIG_SOC_CAMERA=y 262CONFIG_SOC_CAMERA=y
257CONFIG_V4L_MEM2MEM_DRIVERS=y 263CONFIG_V4L_MEM2MEM_DRIVERS=y
258CONFIG_VIDEO_CODA=m 264CONFIG_VIDEO_CODA=m
265CONFIG_VIDEO_IMX_PXP=y
259# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set 266# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
260CONFIG_VIDEO_ADV7180=m 267CONFIG_VIDEO_ADV7180=m
261CONFIG_VIDEO_OV5640=m 268CONFIG_VIDEO_OV5640=m
@@ -302,6 +309,7 @@ CONFIG_SND_SOC_WM8962=y
302CONFIG_SND_SIMPLE_CARD=y 309CONFIG_SND_SIMPLE_CARD=y
303CONFIG_HID_MULTITOUCH=y 310CONFIG_HID_MULTITOUCH=y
304CONFIG_USB=y 311CONFIG_USB=y
312CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
305CONFIG_USB_EHCI_HCD=y 313CONFIG_USB_EHCI_HCD=y
306CONFIG_USB_EHCI_MXC=y 314CONFIG_USB_EHCI_MXC=y
307CONFIG_USB_STORAGE=y 315CONFIG_USB_STORAGE=y
@@ -429,6 +437,7 @@ CONFIG_NLS_UTF8=y
429CONFIG_SECURITYFS=y 437CONFIG_SECURITYFS=y
430CONFIG_CRYPTO_DEV_FSL_CAAM=y 438CONFIG_CRYPTO_DEV_FSL_CAAM=y
431CONFIG_CRYPTO_DEV_SAHARA=y 439CONFIG_CRYPTO_DEV_SAHARA=y
440CONFIG_CRYPTO_DEV_MXS_DCP=y
432CONFIG_CRC_CCITT=m 441CONFIG_CRC_CCITT=m
433CONFIG_CRC_T10DIF=y 442CONFIG_CRC_T10DIF=y
434CONFIG_CRC7=m 443CONFIG_CRC7=m
diff --git a/recipes-kernel/linux/linux-fslc_4.20.bb b/recipes-kernel/linux/linux-fslc_5.0.bb
index d7bf4b7a..b9c7efde 100644
--- a/recipes-kernel/linux/linux-fslc_4.20.bb
+++ b/recipes-kernel/linux/linux-fslc_5.0.bb
@@ -11,9 +11,9 @@ include linux-fslc.inc
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 12LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
13 13
14PV = "4.20+git${SRCPV}" 14PV = "5.0.3+git${SRCPV}"
15 15
16SRCBRANCH = "4.20.x+fslc" 16SRCBRANCH = "5.0.x+fslc"
17SRCREV = "bf414f71d71348bf549d320fa6518b04738dbaa1" 17SRCREV = "20d8efe363508fc77934cfa69e16cdfcff025ebd"
18 18
19COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" 19COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"