diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-12-29 15:30:43 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-29 15:30:43 -0300 |
commit | 5d963d162ecc7ae377987fe4cc141667fdc8ab88 (patch) | |
tree | 90ceae4a3568ffd4c0c66bf45686600ad38e5a8d /conf/machine/include/imx-base.inc | |
parent | 9f57971d870bfad144aa8022bc4f1442d990b8b6 (diff) | |
parent | 6579ce9b77f0036454478b2e07694f7314f97867 (diff) | |
download | meta-freescale-5d963d162ecc7ae377987fe4cc141667fdc8ab88.tar.gz |
Merge pull request #1713 from jmarcoscosta/fix-overrides-for-multilib
imx93: add fixes to enable multilib out-of-the-box
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r-- | conf/machine/include/imx-base.inc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 7d63472f..5d4b427f 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -618,7 +618,8 @@ WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" | |||
618 | 618 | ||
619 | OPTEE_BIN_EXT ??= "" | 619 | OPTEE_BIN_EXT ??= "" |
620 | OPTEE_BOOT_IMAGE = "tee.bin uTee-${OPTEE_BIN_EXT}" | 620 | OPTEE_BOOT_IMAGE = "tee.bin uTee-${OPTEE_BIN_EXT}" |
621 | OPTEE_BOOT_IMAGE:aarch64 = "tee.bin" | 621 | OPTEE_BOOT_IMAGE:mx8-generic-bsp = "tee.bin" |
622 | OPTEE_BOOT_IMAGE:mx9-generic-bsp = "tee.bin" | ||
622 | 623 | ||
623 | IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" | 624 | IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" |
624 | 625 | ||
@@ -651,7 +652,10 @@ WKS_FILE_DEPENDS ?= " \ | |||
651 | # | 652 | # |
652 | # NOTE: the results binary name of the boot container is set to 'imx-boot' | 653 | # NOTE: the results binary name of the boot container is set to 'imx-boot' |
653 | # for both NXP and Mainline BSP. | 654 | # for both NXP and Mainline BSP. |
654 | WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \ | 655 | WKS_FILE_DEPENDS:append:imx-generic-bsp:mx8-generic-bsp = " \ |
656 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ | ||
657 | " | ||
658 | WKS_FILE_DEPENDS:append:imx-generic-bsp:mx9-generic-bsp = " \ | ||
655 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ | 659 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ |
656 | " | 660 | " |
657 | 661 | ||
@@ -666,7 +670,8 @@ SERIAL_CONSOLES = "115200;ttymxc0" | |||
666 | SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" | 670 | SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" |
667 | 671 | ||
668 | KERNEL_IMAGETYPE = "zImage" | 672 | KERNEL_IMAGETYPE = "zImage" |
669 | KERNEL_IMAGETYPE:aarch64 = "Image" | 673 | KERNEL_IMAGETYPE:mx8-generic-bsp = "Image" |
674 | KERNEL_IMAGETYPE:mx9-generic-bsp = "Image" | ||
670 | 675 | ||
671 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen screen" | 676 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen screen" |
672 | 677 | ||