diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-18 19:01:54 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-28 00:49:04 +0100 |
| commit | cdfe805bc1ce02d0fdd1a3597adc7fcddbf0fe52 (patch) | |
| tree | 42ec366f9b793b4e3bdac9667157a2826081c6b3 /conf | |
| parent | be865b1a25b75de27876529e8034728a9ca69207 (diff) | |
machines: colibri-imx8x: configure the kernel version for upstream
React on the upstream override and then use a mainlinish kernel.
Use the same kernel also for upstream-rt as we currently don't have
a mainlinish rt flavour ready for i.MX8 X.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit f513116f29ee1533af9d51e72526acd3f00893d7)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/colibri-imx8x.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 40db99b..440b3ec 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -6,6 +6,7 @@ MACHINE_NAME = "Colibri-iMX8X" MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" require conf/machine/include/imx-base.inc # if one wants cortexa35-crypto, set DEFAULTTUNE accordingly @@ -28,6 +29,7 @@ KERNEL_DEVICETREE = " \ freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dtb \ freescale/fsl-imx8qxp-colibri-aster.dtb \ " +KERNEL_DEVICETREE_upstream = "freescale/imx8qxp-colibri-eval-v3.dtb" UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" @@ -46,6 +48,8 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" # Currently we use the nxp 2018.03 downstream for mx8 as some features are |