diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-04-22 16:36:12 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-09 18:53:14 +0200 |
| commit | a5ac7cb04087ba1ab4d46930c8150b2ee47fec7e (patch) | |
| tree | 22ca9edec327e9a1db39d639141dd28ed4e59d74 /conf/machine/colibri-imx8x.conf | |
| parent | 06c9a94fadf432e964691fa7bd814b6e647d3f37 (diff) | |
meta: replace upstream with use-mainline-bsp overrides in some places
There is a little bit messing with the usages of upstream and
use-mainline-bsp overrides, let's change to use use-mainline-bsp for
kernel and devicetree choosing, upstream would be used to set
use-mainline-bsp in MACHINEOVERRIDES.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 06e21ad7f07f03604c405a6ef0ca119f1d9aabc5)
Diffstat (limited to 'conf/machine/colibri-imx8x.conf')
| -rw-r--r-- | conf/machine/colibri-imx8x.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 14fc0ec..a1f204d 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -30,7 +30,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" +KERNEL_DEVICETREE_use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb" UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" @@ -49,11 +49,11 @@ PREFERRED_PROVIDER_u-boot-default-script = "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_use-mainline-bsp = "linux-toradex-mainline" # TODO: Add colibri-imx8x to linux-toradex-mainline-rt. # So far it's not supported yet in linux-toradex-mainline-rt source, spin to # linux-toradex-mainline temporarily. -PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_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 |