From 353c9afa529daf6d594c3b29e311dee92c79d9d3 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 2 Jun 2022 14:14:44 +0200 Subject: conf:machine: dont append use-mainline-bsp to MACHINEOVERRIDES This leads to a multiple use-mainline-bsp existing in MACHINEOVERRIDES and more importantly, it breaks the rules when handling FILESOVERRIDES, the machine overrides is not the last item in MACHINEOVERRIDES any more so bitbake might find a wrong path for files in SRC_URI. Related-to: ELB-4373 Signed-off-by: Ming Liu --- conf/machine/include/colibri-imx6ull-emmc.inc | 2 -- conf/machine/include/colibri-imx6ull.inc | 1 - conf/machine/include/colibri-imx7-emmc.inc | 2 -- conf/machine/include/colibri-imx7.inc | 2 -- 4 files changed, 7 deletions(-) diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc index 278ba8c..2f4c1e4 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -11,8 +11,6 @@ MACHINE_NAME = "Colibri-iMX6ULL-eMMC" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" -# MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" - UBOOT_MAKE_TARGET_colibri-imx6ull-emmc = "u-boot.imx" UBOOT_ENTRYPOINT_colibri-imx6ull-emmc = "0x81000000" UBOOT_DTB_LOADADDRESS_colibri-imx6ull-emmc = "0x82100000" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 328d15b..b83da92 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -14,7 +14,6 @@ MACHINE_NAME = "Colibri-iMX6ULL" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" -MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index dd67ea8..a9577b2 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -7,8 +7,6 @@ TORADEX_FLASH_TYPE = "emmc" MACHINE_NAME = "Colibri-iMX7-eMMC" -MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" - MACHINE_FIRMWARE_remove = "firmware-imx-epdc" MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 4cc2d59..d467205 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -8,8 +8,6 @@ TORADEX_FLASH_TYPE = "rawnand" MACHINE_NAME = "Colibri-iMX7" -MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" - MACHINE_FIRMWARE_remove = "firmware-imx-epdc" MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" -- cgit v1.2.3