From 06e21ad7f07f03604c405a6ef0ca119f1d9aabc5 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 22 Apr 2020 16:36:12 +0200 Subject: 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 --- conf/machine/colibri-imx8x.conf | 6 +++--- conf/machine/include/apalis-imx6.inc | 4 ++-- conf/machine/include/colibri-imx6.inc | 4 ++-- conf/machine/include/colibri-imx6ull.inc | 4 ++-- conf/machine/include/colibri-imx7-emmc.inc | 4 ++-- conf/machine/include/colibri-imx7.inc | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 7d8dcc2..95cbb75 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 @@ 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_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 0b02743..aad9004 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" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index eb25c74..a682071 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" UBOOT_SUFFIX = "img" 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" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index cfb652b..817f9f3 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_use-mainline-bsp = " \ imx7d-colibri-emmc-aster.dtb imx7d-colibri-emmc-eval-v3.dtb \ diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 09512ea..38c448a 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -29,7 +29,7 @@ KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ imx7s-colibri-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" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" -- cgit v1.2.3