diff options
author | Ming Liu <ming.liu@toradex.com> | 2022-06-02 14:14:44 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-07-01 22:06:20 +0200 |
commit | 1b82f315e4ba9f3fa9a9c140e76f2afdc1f12398 (patch) | |
tree | d3a4dafc0368dd8284ed9b5b5466123cd2bd3308 /conf/machine/include/colibri-imx6ull-emmc.inc | |
parent | ec9688b2989b9288d026b64bfaa9c14b3244be5d (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-imx6ull-emmc.inc')
-rw-r--r-- | conf/machine/include/colibri-imx6ull-emmc.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc index f71c6a3..0ec064d 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -9,8 +9,6 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update" MACHINE_NAME = "Colibri-iMX6ULL-eMMC" -MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp" - IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx" |