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-imx7.inc | 2 -- 1 file changed, 2 deletions(-) (limited to 'conf/machine/include/colibri-imx7.inc') 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