summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx6ull.inc
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2020-04-22 16:36:12 +0200
committerMing Liu <ming.liu@toradex.com>2020-04-23 10:58:36 +0200
commit06e21ad7f07f03604c405a6ef0ca119f1d9aabc5 (patch)
treea4da8653d22ecf075950131e8cc39eddaa03c83b /conf/machine/include/colibri-imx6ull.inc
parent6761787707bafec579893bc5fa553e8807bea0d1 (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>
Diffstat (limited to 'conf/machine/include/colibri-imx6ull.inc')
-rw-r--r--conf/machine/include/colibri-imx6ull.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 538bf48..371c7c8 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -28,5 +28,5 @@ KERNEL_DEVICETREE += " \
"
KERNEL_DEVICETREE_use-mainline-bsp = "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.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"