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/include/colibri-imx6.inc | |
| 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/include/colibri-imx6.inc')
| -rw-r--r-- | conf/machine/include/colibri-imx6.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index ebb40f0..5ca8dcf 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -16,8 +16,8 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" KERNEL_IMAGETYPE_${MACHINE} = "zImage" KERNEL_DEVICETREE += "imx6dl-colibri-iris.dtb imx6dl-colibri-iris-v2.dtb" 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-rt" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline-rt" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_SUFFIX = "img" |