summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx7-emmc.inc
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2022-06-02 14:14:44 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-07-01 22:06:20 +0200
commit1b82f315e4ba9f3fa9a9c140e76f2afdc1f12398 (patch)
treed3a4dafc0368dd8284ed9b5b5466123cd2bd3308 /conf/machine/include/colibri-imx7-emmc.inc
parentec9688b2989b9288d026b64bfaa9c14b3244be5d (diff)
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 <ming.liu@toradex.com> (cherry picked from commit 353c9afa529daf6d594c3b29e311dee92c79d9d3)
Diffstat (limited to 'conf/machine/include/colibri-imx7-emmc.inc')
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc2
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index c7c3b21..812ecfc 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"