diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 67f2081bf..fdd5d99bb 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" PREFERRED_PROVIDER_u-boot ??= "u-boot-dey" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-dey" PREFERRED_PROVIDER_virtual/kernel ??= "linux-dey" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-4.18.y" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-4.20.y" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # @@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # ------------------------------------------------- # ccimx6 4.9 2017.03, 2015.04 # ccimx6qp 4.9 2017.03, 2015.04 -# ccimx6ul 4.9 2017.03, 2015.04 +# ccimx6ul 4.9, 4.20 2017.03, 2015.04 # ccimx8x 4.9 2017.03 (packaged in imx-boot) # diff --git a/meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb b/meta-digi-arm/recipes-kernel/linux/linux-4.20.y.bb similarity index 74% rename from meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb rename to meta-digi-arm/recipes-kernel/linux/linux-4.20.y.bb index 83490c1b3..4d7ff652a 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-4.20.y.bb @@ -1,8 +1,8 @@ -# Copyright (C) 2018 Digi International +# Copyright (C) 2019 Digi International require recipes-kernel/linux/linux-dey.inc -SRCBRANCH = "v4.18.y" +SRCBRANCH = "v4.20.y" SRCREV = "${AUTOREV}" DEPENDS += "openssl-native"