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)

6 files changed, 13 insertions, 13 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
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 59dab9e..8d81d4f 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -21,8 +21,8 @@ KERNEL_DEVICETREE_use-mainline-bsp += " \
 "
 
 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"
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"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 533ef30..736e5e9 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -30,5 +30,5 @@ KERNEL_DEVICETREE_append_use_nxp_bsp = " \
     imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-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"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 07a3460..4bfce4c 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -16,8 +16,8 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
 
 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"
 
 KERNEL_DEVICETREE_append_use-nxp-bsp = " \
     imx7d-colibri-emmc-iris.dtb \
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 6bd0453..9da911e 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -25,8 +25,8 @@ KERNEL_DEVICETREE_append_use-mainline-bsp = " \
     imx7s-colibri-aster.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"