diff options
124 files changed, 422 insertions, 397 deletions
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index cdd16a66..cdfbb97e 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass | |||
@@ -37,7 +37,7 @@ do_image_wic[depends] += " \ | |||
37 | " | 37 | " |
38 | 38 | ||
39 | # We need to apply a fixup inside of the partition table | 39 | # We need to apply a fixup inside of the partition table |
40 | IMAGE_CMD:wic:append:mxs() { | 40 | IMAGE_CMD:wic:append:mxs-generic-bsp() { |
41 | # Change partition type for mxs processor family | 41 | # Change partition type for mxs processor family |
42 | bbnote "Setting partition type to 0x53 as required for mxs' SoC family." | 42 | bbnote "Setting partition type to 0x53 as required for mxs' SoC family." |
43 | echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc | 43 | echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc |
diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass index 876ddd10..b9b00ebe 100644 --- a/classes/machine-overrides-extender.bbclass +++ b/classes/machine-overrides-extender.bbclass | |||
@@ -12,19 +12,17 @@ | |||
12 | # | 12 | # |
13 | # MACHINEOVERRIDES_EXTENDER_FILTER_OUT:override = "group1 group2" | 13 | # MACHINEOVERRIDES_EXTENDER_FILTER_OUT:override = "group1 group2" |
14 | # | 14 | # |
15 | # Copyright 2016-2018 (C) O.S. Systems Software LTDA. | 15 | # Copyright 2016-2018, 2022 (C) O.S. Systems Software LTDA. |
16 | 16 | ||
17 | def machine_overrides_extender(d): | 17 | def machine_overrides_extender(d): |
18 | machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':') | 18 | machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':') |
19 | 19 | ||
20 | # Gather the list of overrides to filter out | 20 | # Gather the list of overrides to filter out |
21 | machine_overrides_filter_out = [] | 21 | machine_overrides_filter_out = (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT') or '').split() |
22 | for override in machine_overrides: | 22 | for override in machine_overrides: |
23 | machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split() | 23 | machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split() |
24 | 24 | ||
25 | # Drop any overrides of filter_out prior extending | 25 | # Extend the overrides |
26 | machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] | ||
27 | |||
28 | for override in machine_overrides: | 26 | for override in machine_overrides: |
29 | extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override) | 27 | extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override) |
30 | 28 | ||
@@ -40,6 +38,9 @@ def machine_overrides_extender(d): | |||
40 | for e in extender: | 38 | for e in extender: |
41 | machine_overrides.insert(index, e) | 39 | machine_overrides.insert(index, e) |
42 | 40 | ||
41 | # Drop any overrides of filter_out after extending | ||
42 | machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] | ||
43 | |||
43 | return ':'.join(machine_overrides) | 44 | return ':'.join(machine_overrides) |
44 | 45 | ||
45 | python machine_overrides_extender_handler() { | 46 | python machine_overrides_extender_handler() { |
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass index 1d4c5513..deae9c93 100644 --- a/classes/mfgtool-initramfs-image.bbclass +++ b/classes/mfgtool-initramfs-image.bbclass | |||
@@ -13,7 +13,7 @@ FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs" | |||
13 | FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs" | 13 | FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs" |
14 | 14 | ||
15 | IMAGE_FSTYPES = "cpio.gz.u-boot" | 15 | IMAGE_FSTYPES = "cpio.gz.u-boot" |
16 | IMAGE_FSTYPES:mxs = "cpio.gz.u-boot" | 16 | IMAGE_FSTYPES:mxs-generic-bsp = "cpio.gz.u-boot" |
17 | IMAGE_ROOTFS_SIZE ?= "8192" | 17 | IMAGE_ROOTFS_SIZE ?= "8192" |
18 | 18 | ||
19 | # Filesystems enabled by default | 19 | # Filesystems enabled by default |
diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass index c6c7f043..4baf4574 100644 --- a/classes/use-imx-headers.bbclass +++ b/classes/use-imx-headers.bbclass | |||
@@ -13,14 +13,14 @@ | |||
13 | # | 13 | # |
14 | # Copyright 2018 (C) O.S. Systems Software LTDA. | 14 | # Copyright 2018 (C) O.S. Systems Software LTDA. |
15 | 15 | ||
16 | DEPENDS:append:imx = " linux-imx-headers" | 16 | DEPENDS:append:imx-nxp-bsp = " linux-imx-headers" |
17 | 17 | ||
18 | # Set runtime dependency of -dev for package inheriting this class to | 18 | # Set runtime dependency of -dev for package inheriting this class to |
19 | # linux-imx-headers-dev package. This is required in order to propagate | 19 | # linux-imx-headers-dev package. This is required in order to propagate |
20 | # headers into the SDK | 20 | # headers into the SDK |
21 | RDEPENDS:${PN}-dev += "linux-imx-headers-dev" | 21 | RDEPENDS:${PN}-dev += "linux-imx-headers-dev" |
22 | 22 | ||
23 | PACKAGE_ARCH:imx ?= "${MACHINE_SOCARCH}" | 23 | PACKAGE_ARCH:imx-nxp-bsp ?= "${MACHINE_SOCARCH}" |
24 | 24 | ||
25 | STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" | 25 | STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" |
26 | 26 | ||
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index 9650059b..bdbf3684 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass | |||
@@ -18,14 +18,14 @@ | |||
18 | 18 | ||
19 | SECO_FIRMWARE_NAME ?= "" | 19 | SECO_FIRMWARE_NAME ?= "" |
20 | 20 | ||
21 | SECO_FIRMWARE_NAME:mx8qm = "mx8qmb0-ahab-container.img" | 21 | SECO_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qmb0-ahab-container.img" |
22 | SECO_FIRMWARE_NAME:mx8qxp = \ | 22 | SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp = \ |
23 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ | 23 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ |
24 | 'mx8qxc0-ahab-container.img', d)}" | 24 | 'mx8qxc0-ahab-container.img', d)}" |
25 | SECO_FIRMWARE_NAME:mx8dxl = "mx8dxla1-ahab-container.img" | 25 | SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxla1-ahab-container.img" |
26 | 26 | ||
27 | python () { | 27 | python () { |
28 | if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"): | 28 | if "mx8m-nxp-bsp" in d.getVar('MACHINEOVERRIDES').split(":"): |
29 | return # We need to allow the recipes to be parsed for this case | 29 | return # We need to allow the recipes to be parsed for this case |
30 | 30 | ||
31 | seco_firmware = d.getVar('SECO_FIRMWARE_NAME') | 31 | seco_firmware = d.getVar('SECO_FIRMWARE_NAME') |
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 171b9f00..a5ec1249 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf | |||
@@ -11,7 +11,7 @@ | |||
11 | # * imx6solosabreauto | 11 | # * imx6solosabreauto |
12 | # and is able to work for all the machines. | 12 | # and is able to work for all the machines. |
13 | 13 | ||
14 | MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" | 14 | MACHINEOVERRIDES =. "mx6q:mx6dl:" |
15 | 15 | ||
16 | require conf/machine/include/imx-base.inc | 16 | require conf/machine/include/imx-base.inc |
17 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc | 17 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a5133625..81d1c962 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
@@ -11,7 +11,7 @@ | |||
11 | # * imx6solosabresd | 11 | # * imx6solosabresd |
12 | # and is able to work for all the machines. | 12 | # and is able to work for all the machines. |
13 | 13 | ||
14 | MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" | 14 | MACHINEOVERRIDES =. "mx6q:mx6dl:" |
15 | 15 | ||
16 | require conf/machine/include/imx-base.inc | 16 | require conf/machine/include/imx-base.inc |
17 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc | 17 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index b25182ba..a0048974 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SL Evaluation Kit | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SL Evaluation Kit |
5 | #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> | 5 | #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6sl:" | 7 | MACHINEOVERRIDES =. "mx6sl:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index ea525845..19df28a4 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK |
5 | #@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com | 5 | #@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6sll:" | 7 | MACHINEOVERRIDES =. "mx6sll:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 9e83c458..18f490f4 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre Automotive | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre Automotive |
5 | #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> | 5 | #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6sx:" | 7 | MACHINEOVERRIDES =. "mx6sx:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index d0a89596..9f939ca7 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD |
5 | #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> | 5 | #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6sx:" | 7 | MACHINEOVERRIDES =. "mx6sx:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 09d64b4e..70cb68e6 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK |
5 | #@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> | 5 | #@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6ul:" | 7 | MACHINEOVERRIDES =. "mx6ul:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index e71e34e4..722e0757 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK |
5 | #@MAINTAINER: Lauren Post <lauren.post@nxp.com> | 5 | #@MAINTAINER: Lauren Post <lauren.post@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6ull:" | 7 | MACHINEOVERRIDES =. "mx6ull:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index a47c08f8..7775fde3 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK |
5 | #@MAINTAINER: Jun Zhu <junzhu@nxp.com> | 5 | #@MAINTAINER: Jun Zhu <junzhu@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" | 7 | MACHINEOVERRIDES =. "mx6ulz:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index cb63dceb..e20d3f2a 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit |
5 | #@MAINTAINER: Jun Zhu <junzhu@nxp.com> | 5 | #@MAINTAINER: Jun Zhu <junzhu@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mq:" | 7 | MACHINEOVERRIDES =. "imx-boot-container:mx8mq:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 10 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6136713d..ac9aba80 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -75,20 +75,20 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | |||
75 | 75 | ||
76 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 76 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
77 | 77 | ||
78 | UBOOT_ENTRYPOINT:mxs = "0x40008000" | 78 | UBOOT_ENTRYPOINT:mxs-generic-bsp = "0x40008000" |
79 | UBOOT_ENTRYPOINT:mx51 = "0x90008000" | 79 | UBOOT_ENTRYPOINT:mx51-generic-bsp = "0x90008000" |
80 | UBOOT_ENTRYPOINT:mx53 = "0x70008000" | 80 | UBOOT_ENTRYPOINT:mx53-generic-bsp = "0x70008000" |
81 | UBOOT_ENTRYPOINT:mx6 = "0x10008000" | 81 | UBOOT_ENTRYPOINT:mx6-generic-bsp = "0x10008000" |
82 | UBOOT_ENTRYPOINT:mx6sl = "0x80008000" | 82 | UBOOT_ENTRYPOINT:mx6sl-generic-bsp = "0x80008000" |
83 | UBOOT_ENTRYPOINT:mx6sll = "0x80008000" | 83 | UBOOT_ENTRYPOINT:mx6sll-generic-bsp = "0x80008000" |
84 | UBOOT_ENTRYPOINT:mx6sx = "0x80008000" | 84 | UBOOT_ENTRYPOINT:mx6sx-generic-bsp = "0x80008000" |
85 | UBOOT_ENTRYPOINT:mx6ul = "0x80008000" | 85 | UBOOT_ENTRYPOINT:mx6ul-generic-bsp = "0x80008000" |
86 | UBOOT_ENTRYPOINT:mx6ull = "0x80008000" | 86 | UBOOT_ENTRYPOINT:mx6ull-generic-bsp = "0x80008000" |
87 | UBOOT_ENTRYPOINT:mx6ulz = "0x80008000" | 87 | UBOOT_ENTRYPOINT:mx6ulz-generic-bsp = "0x80008000" |
88 | UBOOT_ENTRYPOINT:mx7 = "0x80008000" | 88 | UBOOT_ENTRYPOINT:mx7-generic-bsp = "0x80008000" |
89 | UBOOT_ENTRYPOINT:mx7ulp = "0x60008000" | 89 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp = "0x60008000" |
90 | UBOOT_ENTRYPOINT:mx8m = "0x40480000" | 90 | UBOOT_ENTRYPOINT:mx8m-generic-bsp = "0x40480000" |
91 | UBOOT_ENTRYPOINT:vf = "0x80008000" | 91 | UBOOT_ENTRYPOINT:vf-generic-bsp = "0x80008000" |
92 | 92 | ||
93 | # Some derivates can utilize the boot container provided by U-Boot, | 93 | # Some derivates can utilize the boot container provided by U-Boot, |
94 | # below variable sets that those machines which have a imx-boot-container | 94 | # below variable sets that those machines which have a imx-boot-container |
@@ -96,12 +96,12 @@ UBOOT_ENTRYPOINT:vf = "0x80008000" | |||
96 | UBOOT_PROVIDES_BOOT_CONTAINER = "0" | 96 | UBOOT_PROVIDES_BOOT_CONTAINER = "0" |
97 | UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" | 97 | UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" |
98 | 98 | ||
99 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 99 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
100 | XSERVER_DRIVER = "xf86-video-fbdev" | 100 | XSERVER_DRIVER = "xf86-video-fbdev" |
101 | XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" | 101 | XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" |
102 | XSERVER_DRIVER:vf = "xf86-video-modesetting" | 102 | XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" |
103 | XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting" | 103 | XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" |
104 | XSERVER_DRIVER:use-mainline-bsp = " \ | 104 | XSERVER_DRIVER:imx-mainline-bsp = " \ |
105 | xf86-video-fbdev \ | 105 | xf86-video-fbdev \ |
106 | xf86-video-modesetting \ | 106 | xf86-video-modesetting \ |
107 | xserver-xorg-extension-glx \ | 107 | xserver-xorg-extension-glx \ |
@@ -118,42 +118,87 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | |||
118 | # ARM_INSTRUCTION_SET = "thumb" | 118 | # ARM_INSTRUCTION_SET = "thumb" |
119 | # | 119 | # |
120 | # handled by software | 120 | # handled by software |
121 | # DEFAULTTUNE:mx6 ?= "cortexa9t-neon" | 121 | # DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9t-neon" |
122 | # handled by hardware | 122 | # handled by hardware |
123 | DEFAULTTUNE:mx6 ?= "cortexa9thf-neon" | 123 | DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9thf-neon" |
124 | DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon" | 124 | DEFAULTTUNE:mx6ul-generic-bsp ?= "cortexa7thf-neon" |
125 | DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon" | 125 | DEFAULTTUNE:mx6ull-generic-bsp ?= "cortexa7thf-neon" |
126 | DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon" | 126 | DEFAULTTUNE:mx6ulz-generic-bsp ?= "cortexa7thf-neon" |
127 | DEFAULTTUNE:mx7 ?= "cortexa7thf-neon" | 127 | DEFAULTTUNE:mx7-generic-bsp ?= "cortexa7thf-neon" |
128 | DEFAULTTUNE:vf ?= "cortexa5thf-neon" | 128 | DEFAULTTUNE:vf-generic-bsp ?= "cortexa5thf-neon" |
129 | 129 | ||
130 | DEFAULTTUNE:mx8m ?= "cortexa53-crypto" | 130 | DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto" |
131 | DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto" | 131 | DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" |
132 | DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto" | 132 | DEFAULTTUNE:mx8qxp-generic-bsp ?= "cortexa35-crypto" |
133 | 133 | ||
134 | INHERIT += "machine-overrides-extender" | 134 | INHERIT += "machine-overrides-extender" |
135 | 135 | ||
136 | MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | 136 | ####### |
137 | MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" | 137 | ### NXP BSP specific overrides |
138 | MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" | 138 | ####### |
139 | MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" | 139 | |
140 | MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc" | 140 | MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" |
141 | MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp" | 141 | MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" |
142 | MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc" | 142 | |
143 | MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc" | 143 | MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" |
144 | MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc" | 144 | |
145 | MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" | 145 | MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" |
146 | MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" | 146 | MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
147 | MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | 147 | |
148 | MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d" | 148 | MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:imxfbdev:imxpxp" |
149 | MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | 149 | MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
150 | MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" | 150 | MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
151 | MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" | 151 | |
152 | MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev" | 152 | MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
153 | 153 | MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" | |
154 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ | 154 | |
155 | imx \ | 155 | MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" |
156 | \ | 156 | |
157 | MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | ||
158 | MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp:imxdrm:imxgpu:imxgpu3d" | ||
159 | MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | ||
160 | MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d" | ||
161 | |||
162 | MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" | ||
163 | MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp:imxfbdev" | ||
164 | |||
165 | ####### | ||
166 | ### Mainline BSP specific overrides | ||
167 | ####### | ||
168 | |||
169 | MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp" | ||
170 | |||
171 | MACHINEOVERRIDES_EXTENDER:mx28:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx28-generic-bsp:mx28-mainline-bsp" | ||
172 | |||
173 | MACHINEOVERRIDES_EXTENDER:mx51:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx51-generic-bsp:mx51-mainline-bsp" | ||
174 | MACHINEOVERRIDES_EXTENDER:mx53:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx53-generic-bsp:mx53-mainline-bsp" | ||
175 | |||
176 | MACHINEOVERRIDES_EXTENDER:mx6q:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6q-generic-bsp:mx6q-mainline-bsp" | ||
177 | MACHINEOVERRIDES_EXTENDER:mx6dl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6dl-generic-bsp:mx6dl-mainline-bsp" | ||
178 | |||
179 | MACHINEOVERRIDES_EXTENDER:mx6sx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sx-generic-bsp:mx6sx-mainline-bsp" | ||
180 | |||
181 | MACHINEOVERRIDES_EXTENDER:mx6sl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sl-generic-bsp:mx6sl-mainline-bsp" | ||
182 | MACHINEOVERRIDES_EXTENDER:mx6sll:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sll-generic-bsp:mx6sll-mainline-bsp" | ||
183 | |||
184 | MACHINEOVERRIDES_EXTENDER:mx6ul:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp" | ||
185 | MACHINEOVERRIDES_EXTENDER:mx6ull:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp:mx6ull-generic-bsp:mx6ull-mainline-bsp" | ||
186 | MACHINEOVERRIDES_EXTENDER:mx6ulz:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp:mx6ull-generic-bsp:mx6ull-mainline-bsp:mx6ulz-generic-bsp:mx6ulz-mainline-bsp" | ||
187 | |||
188 | MACHINEOVERRIDES_EXTENDER:mx7d:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7d-generic-bsp:mx7d-mainline-bsp" | ||
189 | MACHINEOVERRIDES_EXTENDER:mx7ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7ulp-generic-bsp:mx7ulp-mainline-bsp" | ||
190 | |||
191 | MACHINEOVERRIDES_EXTENDER:mx8qm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qm-generic-bsp:mx8qm-mainline-bsp" | ||
192 | |||
193 | MACHINEOVERRIDES_EXTENDER:mx8mm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mm-generic-bsp:mx8mm-mainline-bsp" | ||
194 | MACHINEOVERRIDES_EXTENDER:mx8mn:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mn-generic-bsp:mx8mn-mainline-bsp" | ||
195 | MACHINEOVERRIDES_EXTENDER:mx8mp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mp-generic-bsp:mx8mp-mainline-bsp" | ||
196 | MACHINEOVERRIDES_EXTENDER:mx8mq:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mq-generic-bsp:mx8mq-mainline-bsp" | ||
197 | |||
198 | MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp" | ||
199 | MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8dxl-generic-bsp:mx8dxl-mainline-bsp" | ||
200 | |||
201 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | ||
157 | mx6 \ | 202 | mx6 \ |
158 | mx6q \ | 203 | mx6q \ |
159 | mx6dl \ | 204 | mx6dl \ |
@@ -181,29 +226,31 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ | |||
181 | 226 | ||
182 | # Sub-architecture support | 227 | # Sub-architecture support |
183 | MACHINE_SOCARCH_SUFFIX ?= "" | 228 | MACHINE_SOCARCH_SUFFIX ?= "" |
184 | MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl" | 229 | MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl" |
185 | MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl" | 230 | MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" |
186 | MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx" | 231 | MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" |
187 | MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl" | 232 | MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" |
188 | MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll" | 233 | MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" |
189 | MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d" | 234 | MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" |
190 | MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp" | 235 | MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" |
191 | MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60" | 236 | MACHINE_SOCARCH_SUFFIX:vf60-nxp-bsp = "-vf60" |
192 | MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50" | 237 | MACHINE_SOCARCH_SUFFIX:vf50-nxp-bsp = "-vf50" |
193 | MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul" | 238 | MACHINE_SOCARCH_SUFFIX:mx6ul-nxp-bsp = "-mx6ul" |
194 | MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul" | 239 | MACHINE_SOCARCH_SUFFIX:mx6ull-nxp-bsp = "-mx6ul" |
195 | MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul" | 240 | MACHINE_SOCARCH_SUFFIX:mx6ulz-nxp-bsp = "-mx6ul" |
196 | MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8" | 241 | MACHINE_SOCARCH_SUFFIX:mx8qm-nxp-bsp = "-mx8" |
197 | MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm" | 242 | MACHINE_SOCARCH_SUFFIX:mx8mm-nxp-bsp = "-mx8mm" |
198 | MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn" | 243 | MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp = "-mx8mn" |
199 | MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp" | 244 | MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" |
200 | MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m" | 245 | MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" |
201 | MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8" | 246 | MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" |
202 | MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl" | 247 | MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl" |
203 | MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" | 248 | |
249 | # For Mainline we use a single SoC suffix as we don't have different build options | ||
250 | MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" | ||
204 | 251 | ||
205 | MACHINE_ARCH_FILTER = "virtual/kernel" | 252 | MACHINE_ARCH_FILTER = "virtual/kernel" |
206 | MACHINE_SOCARCH_FILTER:append:imx = " \ | 253 | MACHINE_SOCARCH_FILTER:append:imx-nxp-bsp = " \ |
207 | alsa-lib \ | 254 | alsa-lib \ |
208 | gstreamer1.0 \ | 255 | gstreamer1.0 \ |
209 | weston \ | 256 | weston \ |
@@ -232,7 +279,7 @@ MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \ | |||
232 | virtual/libgles1 \ | 279 | virtual/libgles1 \ |
233 | virtual/libgles2 \ | 280 | virtual/libgles2 \ |
234 | " | 281 | " |
235 | MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ | 282 | MACHINE_SOCARCH_FILTER:append:imx-mainline-bsp = " \ |
236 | virtual/egl \ | 283 | virtual/egl \ |
237 | virtual/libopenvg \ | 284 | virtual/libopenvg \ |
238 | virtual/libg2d \ | 285 | virtual/libg2d \ |
@@ -244,17 +291,17 @@ MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ | |||
244 | pango \ | 291 | pango \ |
245 | qtbase \ | 292 | qtbase \ |
246 | " | 293 | " |
247 | MACHINE_SOCARCH_FILTER:append:mx6q = " \ | 294 | MACHINE_SOCARCH_FILTER:append:mx6q-nxp-bsp = " \ |
248 | opencl-icd-loader \ | 295 | opencl-icd-loader \ |
249 | opencl-clhpp \ | 296 | opencl-clhpp \ |
250 | opencl-headers \ | 297 | opencl-headers \ |
251 | " | 298 | " |
252 | MACHINE_SOCARCH_FILTER:append:mx8 = " \ | 299 | MACHINE_SOCARCH_FILTER:append:mx8-nxp-bsp = " \ |
253 | opencl-icd-loader \ | 300 | opencl-icd-loader \ |
254 | opencl-clhpp \ | 301 | opencl-clhpp \ |
255 | opencl-headers \ | 302 | opencl-headers \ |
256 | " | 303 | " |
257 | MACHINE_SOCARCH_FILTER:append:mx8qm = " \ | 304 | MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \ |
258 | virtual/libopenvx \ | 305 | virtual/libopenvx \ |
259 | " | 306 | " |
260 | 307 | ||
@@ -270,32 +317,32 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ | |||
270 | 317 | ||
271 | # Firmware | 318 | # Firmware |
272 | MACHINE_FIRMWARE ?= "" | 319 | MACHINE_FIRMWARE ?= "" |
273 | MACHINE_FIRMWARE:append:mx27 = " firmware-imx-vpu-imx27" | 320 | MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27" |
274 | MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" | 321 | MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" |
275 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q" | 322 | MACHINE_FIRMWARE:append:mx6-generic-bsp = " linux-firmware-imx-sdma-imx6q" |
276 | MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q" | 323 | MACHINE_FIRMWARE:append:mx6q-generic-bsp = " firmware-imx-vpu-imx6q" |
277 | MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" | 324 | MACHINE_FIRMWARE:append:mx6dl-generic-bsp = " firmware-imx-vpu-imx6d firmware-imx-epdc" |
278 | MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc" | 325 | MACHINE_FIRMWARE:append:mx6sl-generic-bsp = " firmware-imx-epdc" |
279 | MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc" | 326 | MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc" |
280 | MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc" | 327 | MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc" |
281 | MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" | 328 | MACHINE_FIRMWARE:append:mx53-generic-bsp = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" |
282 | MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" | 329 | MACHINE_FIRMWARE:append:mx51-generic-bsp = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" |
283 | MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d" | 330 | MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
284 | MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d" | 331 | MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
285 | MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" | 332 | MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" |
286 | MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d" | 333 | MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
287 | MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8" | 334 | MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " firmware-imx-vpu-imx8" |
288 | MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8" | 335 | MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-vpu-imx8" |
289 | MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" | 336 | MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" |
290 | 337 | ||
291 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" | 338 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" |
292 | 339 | ||
293 | # Extra audio support | 340 | # Extra audio support |
294 | IMX_ALSA_EXTRA = "" | 341 | IMX_ALSA_EXTRA = "" |
295 | IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" | 342 | IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins" |
296 | MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" | 343 | MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" |
297 | MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" | 344 | MACHINE_EXTRA_RRECOMMENDS:append:mx7-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" |
298 | MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" | 345 | MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" |
299 | 346 | ||
300 | # Extra Cypress Wi-Fi and BTW firmware (Murata) | 347 | # Extra Cypress Wi-Fi and BTW firmware (Murata) |
301 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" | 348 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" |
@@ -320,28 +367,28 @@ MACHINE_EXTRA_RRECOMMENDS += " \ | |||
320 | " | 367 | " |
321 | 368 | ||
322 | # GStreamer 1.0 plugins | 369 | # GStreamer 1.0 plugins |
323 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" | 370 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" |
324 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta" | 371 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
325 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta" | 372 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6q-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
326 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta" | 373 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
327 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta" | 374 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
328 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta" | 375 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
329 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta" | 376 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
330 | MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta" | 377 | MACHINE_GSTREAMER_1_0_PLUGIN:mx7d-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
331 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin" | 378 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm-nxp-bsp ?= "imx-gst1.0-plugin" |
332 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin" | 379 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn-nxp-bsp ?= "imx-gst1.0-plugin" |
333 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin" | 380 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp-nxp-bsp ?= "imx-gst1.0-plugin" |
334 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin" | 381 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq-nxp-bsp ?= "imx-gst1.0-plugin" |
335 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin" | 382 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin" |
336 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin" | 383 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" |
337 | 384 | ||
338 | PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.18.0.imx" | 385 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.18.0.imx" |
339 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.18.0.imx" | 386 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.18.0.imx" |
340 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.18.0.imx" | 387 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ?= "1.18.0.imx" |
341 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.18.0.imx" | 388 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ?= "1.18.0.imx" |
342 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8 ?= "1.18.0" | 389 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ?= "1.18.0" |
343 | PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.18.0" | 390 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ?= "1.18.0" |
344 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8 ?= "1.18.0" | 391 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ?= "1.18.0" |
345 | 392 | ||
346 | # Determines if the SoC has support for Vivante kernel driver | 393 | # Determines if the SoC has support for Vivante kernel driver |
347 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" | 394 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" |
@@ -368,43 +415,34 @@ PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" | |||
368 | PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | 415 | PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" |
369 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | 416 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" |
370 | 417 | ||
371 | PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" | 418 | PREFERRED_VERSION_weston:imx-nxp-bsp ?= "9.0.0.imx" |
372 | PREFERRED_VERSION_weston:use-mainline-bsp = "" | 419 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
373 | 420 | ||
374 | PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.22.imx" | 421 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx" |
375 | PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.22.imx" | 422 | PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx" |
376 | PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.22.imx" | 423 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx" |
377 | 424 | ||
378 | # Use i.MX libdrm Version | 425 | # Use i.MX libdrm Version |
379 | PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx" | 426 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.107.imx" |
380 | PREFERRED_VERSION_libdrm:mx7 ?= "2.4.107.imx" | 427 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx" |
381 | PREFERRED_VERSION_libdrm:mx8 ?= "2.4.107.imx" | 428 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx" |
382 | 429 | ||
383 | # Use i.MX optee Version | 430 | # Use i.MX optee Version |
384 | PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" | 431 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ?= "3.10.0.imx" |
385 | PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx" | 432 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx" |
386 | PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx" | 433 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ?= "3.10.0.imx" |
387 | 434 | ||
388 | #Use i.MX opencv Version for mx8 | 435 | #Use i.MX opencv Version for mx8 |
389 | PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx" | 436 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx" |
390 | 437 | ||
391 | # Handle default kernel | 438 | # Handle default kernel |
392 | IMX_DEFAULT_KERNEL = "linux-fslc-imx" | 439 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" |
393 | IMX_DEFAULT_KERNEL:mxs = "linux-fslc" | 440 | IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx" |
394 | IMX_DEFAULT_KERNEL:mx5 = "linux-fslc" | ||
395 | IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx" | ||
396 | IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx" | ||
397 | IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx" | ||
398 | IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx" | ||
399 | IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx" | ||
400 | IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx" | ||
401 | IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx" | ||
402 | IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" | ||
403 | 441 | ||
404 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" | 442 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" |
405 | 443 | ||
406 | SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" | 444 | SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" |
407 | SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" | 445 | SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "uboot-mxsboot-sdcard wic.bmap wic.gz" |
408 | 446 | ||
409 | # Do not update fstab file when using wic images | 447 | # Do not update fstab file when using wic images |
410 | WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" | 448 | WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" |
@@ -433,8 +471,8 @@ WKS_FILE_DEPENDS ?= " \ | |||
433 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ | 471 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ |
434 | " | 472 | " |
435 | 473 | ||
436 | WKS_FILE_DEPENDS:append:mx8 = " imx-boot" | 474 | WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot" |
437 | WKS_FILE_DEPENDS:append:mx8m = " imx-boot" | 475 | WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot" |
438 | 476 | ||
439 | # We need to restrict the append so we don't add this for other i.MX SoC's. | 477 | # We need to restrict the append so we don't add this for other i.MX SoC's. |
440 | # Derivatives that are not yet adopted the usage of boot container provided | 478 | # Derivatives that are not yet adopted the usage of boot container provided |
@@ -448,15 +486,15 @@ WKS_FILE_DEPENDS:append:mx8m = " imx-boot" | |||
448 | # deployment task extesion execution defined in imx-boot-container class. | 486 | # deployment task extesion execution defined in imx-boot-container class. |
449 | # For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile | 487 | # For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile |
450 | # task. | 488 | # task. |
451 | WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \ | 489 | WKS_FILE_DEPENDS:append:imx-mainline-bsp:aarch64 = " \ |
452 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ | 490 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ |
453 | " | 491 | " |
454 | 492 | ||
455 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" | 493 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" |
456 | SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in" | 494 | SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" |
457 | 495 | ||
458 | SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in" | 496 | SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" |
459 | SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in" | 497 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" |
460 | 498 | ||
461 | # Boot container built as a part of mainline U-Boot uses different WKS | 499 | # Boot container built as a part of mainline U-Boot uses different WKS |
462 | # file as the entire mx8m series, as U-Boot versions later than 2021.04 are | 500 | # file as the entire mx8m series, as U-Boot versions later than 2021.04 are |
@@ -471,14 +509,11 @@ SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in" | |||
471 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 509 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |
472 | 510 | ||
473 | SERIAL_CONSOLES = "115200;ttymxc0" | 511 | SERIAL_CONSOLES = "115200;ttymxc0" |
474 | SERIAL_CONSOLES:mxs = "115200;ttyAMA0" | 512 | SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" |
475 | 513 | ||
476 | KERNEL_IMAGETYPE = "zImage" | 514 | KERNEL_IMAGETYPE = "zImage" |
477 | KERNEL_IMAGETYPE:aarch64 = "Image" | 515 | KERNEL_IMAGETYPE:aarch64 = "Image" |
478 | 516 | ||
479 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" | 517 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" |
480 | 518 | ||
481 | # Add the ability to specify imx machines | 519 | HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum" |
482 | MACHINEOVERRIDES =. "imx:" | ||
483 | |||
484 | HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum" | ||
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 85419a45..d6778caa 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:" | 1 | MACHINEOVERRIDES =. "imx-boot-container:mx8mm:" |
2 | 2 | ||
3 | require conf/machine/include/imx-base.inc | 3 | require conf/machine/include/imx-base.inc |
4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 4f897349..0f886c00 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:" | 1 | MACHINEOVERRIDES =. "imx-boot-container:mx8mn:" |
2 | 2 | ||
3 | require conf/machine/include/imx-base.inc | 3 | require conf/machine/include/imx-base.inc |
4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 7635d08c..fccfe0aa 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:" | 1 | MACHINEOVERRIDES =. "imx-boot-container:mx8mp:" |
2 | 2 | ||
3 | require conf/machine/include/imx-base.inc | 3 | require conf/machine/include/imx-base.inc |
4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch index 283a081b..283a081b 100644 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch +++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch | |||
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf index 915ecba0..915ecba0 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf | |||
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf index c644d8ba..c644d8ba 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf | |||
diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 94331307..b4b1eddf 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend | |||
@@ -1,10 +1,4 @@ | |||
1 | # Append path for freescale layer to include alsa-state asound.conf | 1 | FILESEXTRAPATHS:prepend:imx-generic-bsp := "${THISDIR}/${PN}/imx-generic-bsp:" |
2 | FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/imx:" | ||
3 | FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/imx:" | ||
4 | FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/imx:" | ||
5 | FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx:" | ||
6 | 2 | ||
7 | PACKAGE_ARCH:mx6 = "${MACHINE_ARCH}" | 3 | # Append path for freescale layer |
8 | PACKAGE_ARCH:mx7 = "${MACHINE_ARCH}" | 4 | PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}" |
9 | PACKAGE_ARCH:mx8 = "${MACHINE_ARCH}" | ||
10 | PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}" | ||
diff --git a/recipes-bsp/alsa-state/alsa-state/imx/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf index c511018e..c511018e 100644 --- a/recipes-bsp/alsa-state/alsa-state/imx/asound.conf +++ b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf | |||
diff --git a/recipes-bsp/alsa-state/alsa-state/imx/asound.state b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state index ace734df..ace734df 100755 --- a/recipes-bsp/alsa-state/alsa-state/imx/asound.state +++ b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state | |||
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb index 6ea16d5b..18ce14d3 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb | |||
@@ -18,6 +18,6 @@ addtask deploy after do_install before do_build | |||
18 | 18 | ||
19 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 19 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
20 | 20 | ||
21 | COMPATIBLE_MACHINE = "(mx8)" | 21 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
22 | COMPATIBLE_MACHINE:mx8m = "(^$)" | 22 | COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)" |
23 | COMPATIBLE_MACHINE:mx8x = "(^$)" | 23 | COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)" |
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb index a48356ed..152ef0b5 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb | |||
@@ -21,4 +21,4 @@ addtask deploy after do_install before do_build | |||
21 | 21 | ||
22 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 22 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
23 | 23 | ||
24 | COMPATIBLE_MACHINE = "(mx8m|imx-boot-container)" | 24 | COMPATIBLE_MACHINE = "(mx8m-generic-bsp)" |
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb index 5628e40b..cfc98a73 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb | |||
@@ -129,4 +129,4 @@ FILES:${PN}-hdmi = " \ | |||
129 | ${nonarch_base_libdir}/firmware/dpfw.bin \ | 129 | ${nonarch_base_libdir}/firmware/dpfw.bin \ |
130 | " | 130 | " |
131 | 131 | ||
132 | COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" | 132 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-bsp/formfactor/formfactor/mx6/machconfig b/recipes-bsp/formfactor/formfactor/mx6-nxp-bsp/machconfig index ded33a07..ded33a07 100644 --- a/recipes-bsp/formfactor/formfactor/mx6/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx6-nxp-bsp/machconfig | |||
diff --git a/recipes-bsp/formfactor/formfactor/mx6sll/machconfig b/recipes-bsp/formfactor/formfactor/mx6sll-nxp-bsp/machconfig index e3b99b7c..e3b99b7c 100644 --- a/recipes-bsp/formfactor/formfactor/mx6sll/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx6sll-nxp-bsp/machconfig | |||
diff --git a/recipes-bsp/formfactor/formfactor/mx6ul/machconfig b/recipes-bsp/formfactor/formfactor/mx6ul-nxp-bsp/machconfig index e3b99b7c..e3b99b7c 100644 --- a/recipes-bsp/formfactor/formfactor/mx6ul/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx6ul-nxp-bsp/machconfig | |||
diff --git a/recipes-bsp/formfactor/formfactor/mx7/machconfig b/recipes-bsp/formfactor/formfactor/mx7-nxp-bsp/machconfig index e3b99b7c..e3b99b7c 100644 --- a/recipes-bsp/formfactor/formfactor/mx7/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx7-nxp-bsp/machconfig | |||
diff --git a/recipes-bsp/formfactor/formfactor/mx7ulp/machconfig b/recipes-bsp/formfactor/formfactor/mx7ulp-nxp-bsp/machconfig index 25b18f21..25b18f21 100644 --- a/recipes-bsp/formfactor/formfactor/mx7ulp/machconfig +++ b/recipes-bsp/formfactor/formfactor/mx7ulp-nxp-bsp/machconfig | |||
diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb index eedcdc54..ded38d4b 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.4.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb | |||
@@ -67,4 +67,4 @@ do_deploy() { | |||
67 | addtask deploy after do_compile | 67 | addtask deploy after do_compile |
68 | 68 | ||
69 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 69 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
70 | COMPATIBLE_MACHINE = "(mx8|imx-boot-container)" | 70 | COMPATIBLE_MACHINE = "(mx8-generic-bsp)" |
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index 58bd44f8..f13299d0 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb | |||
@@ -15,4 +15,4 @@ S = "${WORKDIR}/git" | |||
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||
18 | COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" | 18 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index 4e210057..2ecea3e5 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb | |||
@@ -21,16 +21,16 @@ S = "${WORKDIR}/git" | |||
21 | 21 | ||
22 | inherit use-imx-headers | 22 | inherit use-imx-headers |
23 | 23 | ||
24 | PLATFORM:mx6q = "IMX6Q" | 24 | PLATFORM:mx6q-nxp-bsp = "IMX6Q" |
25 | PLATFORM:mx6dl = "IMX6Q" | 25 | PLATFORM:mx6dl-nxp-bsp = "IMX6Q" |
26 | PLATFORM:mx6sl = "IMX6S" | 26 | PLATFORM:mx6sl-nxp-bsp = "IMX6S" |
27 | PLATFORM:mx6sll = "IMX6UL" | 27 | PLATFORM:mx6sll-nxp-bsp = "IMX6UL" |
28 | PLATFORM:mx6sx = "IMX6S" | 28 | PLATFORM:mx6sx-nxp-bsp = "IMX6S" |
29 | PLATFORM:mx6ul = "IMX6UL" | 29 | PLATFORM:mx6ul-nxp-bsp = "IMX6UL" |
30 | PLATFORM:mx6ull = "IMX6UL" | 30 | PLATFORM:mx6ull-nxp-bsp = "IMX6UL" |
31 | PLATFORM:mx7d = "IMX7" | 31 | PLATFORM:mx7d-nxp-bsp = "IMX7" |
32 | PLATFORM:mx7ulp = "IMX7" | 32 | PLATFORM:mx7ulp-nxp-bsp = "IMX7" |
33 | PLATFORM:mx8ulp = "IMX8ULP" | 33 | PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP" |
34 | 34 | ||
35 | PARALLEL_MAKE="-j 1" | 35 | PARALLEL_MAKE="-j 1" |
36 | EXTRA_OEMAKE = "" | 36 | EXTRA_OEMAKE = "" |
@@ -47,4 +47,4 @@ do_install () { | |||
47 | find ${D}/ -name *.go -exec rm {} \; | 47 | find ${D}/ -name *.go -exec rm {} \; |
48 | } | 48 | } |
49 | 49 | ||
50 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8ulp)" | 50 | COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp)" |
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index b332e079..2b9d420b 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb | |||
@@ -10,8 +10,8 @@ SECTION = "BSP" | |||
10 | inherit use-imx-security-controller-firmware | 10 | inherit use-imx-security-controller-firmware |
11 | 11 | ||
12 | IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" | 12 | IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" |
13 | IMX_EXTRA_FIRMWARE:mx8m = "firmware-imx-8m" | 13 | IMX_EXTRA_FIRMWARE:mx8m-nxp-bsp = "firmware-imx-8m" |
14 | IMX_EXTRA_FIRMWARE:mx8x = "imx-sc-firmware imx-seco" | 14 | IMX_EXTRA_FIRMWARE:mx8x-nxp-bsp = "imx-sc-firmware imx-seco" |
15 | DEPENDS += " \ | 15 | DEPENDS += " \ |
16 | u-boot \ | 16 | u-boot \ |
17 | ${IMX_EXTRA_FIRMWARE} \ | 17 | ${IMX_EXTRA_FIRMWARE} \ |
@@ -20,7 +20,7 @@ DEPENDS += " \ | |||
20 | " | 20 | " |
21 | # xxd is a dependency of fspi_packer.sh | 21 | # xxd is a dependency of fspi_packer.sh |
22 | DEPENDS += "xxd-native" | 22 | DEPENDS += "xxd-native" |
23 | DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native" | 23 | DEPENDS:append:mx8m-nxp-bsp = " u-boot-mkimage-native dtc-native" |
24 | BOOT_NAME = "imx-boot" | 24 | BOOT_NAME = "imx-boot" |
25 | PROVIDES = "${BOOT_NAME}" | 25 | PROVIDES = "${BOOT_NAME}" |
26 | 26 | ||
@@ -61,16 +61,16 @@ IMXBOOT_TARGETS ?= \ | |||
61 | 'flash_multi_cores flash_dcd', d), d)}" | 61 | 'flash_multi_cores flash_dcd', d), d)}" |
62 | 62 | ||
63 | BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" | 63 | BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" |
64 | BOOT_STAGING:mx8m = "${S}/iMX8M" | 64 | BOOT_STAGING:mx8m-nxp-bsp = "${S}/iMX8M" |
65 | BOOT_STAGING:mx8dx = "${S}/iMX8QX" | 65 | BOOT_STAGING:mx8dx-nxp-bsp = "${S}/iMX8QX" |
66 | 66 | ||
67 | SOC_FAMILY = "INVALID" | 67 | SOC_FAMILY = "INVALID" |
68 | SOC_FAMILY:mx8 = "mx8" | 68 | SOC_FAMILY:mx8-nxp-bsp = "mx8" |
69 | SOC_FAMILY:mx8m = "mx8m" | 69 | SOC_FAMILY:mx8m-nxp-bsp = "mx8m" |
70 | SOC_FAMILY:mx8x = "mx8x" | 70 | SOC_FAMILY:mx8x-nxp-bsp = "mx8x" |
71 | 71 | ||
72 | REV_OPTION ?= "" | 72 | REV_OPTION ?= "" |
73 | REV_OPTION:mx8qxp = \ | 73 | REV_OPTION:mx8qxp-nxp-bsp = \ |
74 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ | 74 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ |
75 | 'REV=C0', d)}" | 75 | 'REV=C0', d)}" |
76 | 76 | ||
@@ -201,4 +201,4 @@ addtask deploy before do_build after do_compile | |||
201 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 201 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
202 | FILES:${PN} = "/boot" | 202 | FILES:${PN} = "/boot" |
203 | 203 | ||
204 | COMPATIBLE_MACHINE = "(mx8)" | 204 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb index 27f7a2a7..aca10f60 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb | |||
@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "4ad2999088098c7d95837b7dc88adceda319c2102c8bdf55bf6e945365 | |||
15 | 15 | ||
16 | BOARD_TYPE ?= "mek" | 16 | BOARD_TYPE ?= "mek" |
17 | SC_FIRMWARE_NAME ?= "INVALID" | 17 | SC_FIRMWARE_NAME ?= "INVALID" |
18 | SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" | 18 | SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" |
19 | SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" | 19 | SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" |
20 | SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" | 20 | SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" |
21 | SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" | 21 | SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" |
22 | 22 | ||
23 | symlink_name = "scfw_tcm.bin" | 23 | symlink_name = "scfw_tcm.bin" |
24 | 24 | ||
@@ -38,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1" | |||
38 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 38 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
39 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 39 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
40 | 40 | ||
41 | COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" | 41 | COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" |
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index f8c3c239..38349f4b 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb | |||
@@ -21,4 +21,4 @@ do_install () { | |||
21 | oe_runmake DESTDIR=${D} install | 21 | oe_runmake DESTDIR=${D} install |
22 | } | 22 | } |
23 | 23 | ||
24 | COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" | 24 | COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" |
diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.4.bb b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb index bd5739cd..85ff47bc 100644 --- a/recipes-bsp/imx-seco/imx-seco_3.8.4.bb +++ b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb | |||
@@ -23,4 +23,4 @@ do_deploy () { | |||
23 | install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} | 23 | install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} |
24 | } | 24 | } |
25 | 25 | ||
26 | COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" | 26 | COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" |
diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb index 070fbd30..1850a16a 100644 --- a/recipes-bsp/imx-test/imx-test_00.00.00.bb +++ b/recipes-bsp/imx-test/imx-test_00.00.00.bb | |||
@@ -7,4 +7,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad | |||
7 | ALLOW_EMPTY:${PN} = "1" | 7 | ALLOW_EMPTY:${PN} = "1" |
8 | 8 | ||
9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 9 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
10 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)" | 10 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index d33ad18c..84696e35 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb | |||
@@ -9,8 +9,8 @@ LICENSE = "GPLv2+" | |||
9 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" | 9 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" |
10 | 10 | ||
11 | DEPENDS = "alsa-lib libdrm" | 11 | DEPENDS = "alsa-lib libdrm" |
12 | DEPENDS:append:mx6 = " imx-lib" | 12 | DEPENDS:append:mx6-nxp-bsp = " imx-lib" |
13 | DEPENDS:append:mx7 = " imx-lib" | 13 | DEPENDS:append:mx7-nxp-bsp = " imx-lib" |
14 | DEPENDS:append:imxvpu = " virtual/imxvpu" | 14 | DEPENDS:append:imxvpu = " virtual/imxvpu" |
15 | 15 | ||
16 | PE = "1" | 16 | PE = "1" |
@@ -29,22 +29,22 @@ inherit module-base use-imx-headers | |||
29 | INHIBIT_PACKAGE_STRIP = "1" | 29 | INHIBIT_PACKAGE_STRIP = "1" |
30 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 30 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
31 | 31 | ||
32 | PLATFORM:mx6q = "IMX6Q" | 32 | PLATFORM:mx6q-nxp-bsp = "IMX6Q" |
33 | PLATFORM:mx6dl = "IMX6Q" | 33 | PLATFORM:mx6dl-nxp-bsp = "IMX6Q" |
34 | PLATFORM:mx6sl = "IMX6SL" | 34 | PLATFORM:mx6sl-nxp-bsp = "IMX6SL" |
35 | PLATFORM:mx6sll = "IMX6SL" | 35 | PLATFORM:mx6sll-nxp-bsp = "IMX6SL" |
36 | PLATFORM:mx6sx = "IMX6SX" | 36 | PLATFORM:mx6sx-nxp-bsp = "IMX6SX" |
37 | PLATFORM:mx6ul = "IMX6UL" | 37 | PLATFORM:mx6ul-nxp-bsp = "IMX6UL" |
38 | PLATFORM:mx7d = "IMX7D" | 38 | PLATFORM:mx7d-nxp-bsp = "IMX7D" |
39 | PLATFORM:mx7ulp = "IMX7D" | 39 | PLATFORM:mx7ulp-nxp-bsp = "IMX7D" |
40 | PLATFORM:mx8 = "IMX8" | 40 | PLATFORM:mx8-nxp-bsp = "IMX8" |
41 | 41 | ||
42 | PARALLEL_MAKE = "-j 1" | 42 | PARALLEL_MAKE = "-j 1" |
43 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" | 43 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" |
44 | 44 | ||
45 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 45 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
46 | PACKAGECONFIG:append:imxvpu = " vpu" | 46 | PACKAGECONFIG:append:imxvpu = " vpu" |
47 | PACKAGECONFIG:append:mx8m = " swpdm" | 47 | PACKAGECONFIG:append:mx8m-nxp-bsp = " swpdm" |
48 | 48 | ||
49 | PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr" | 49 | PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr" |
50 | PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu" | 50 | PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu" |
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb index 0de2ad85..6d7adf33 100644 --- a/recipes-bsp/imx-uuc/imx-uuc_git.bb +++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb | |||
@@ -18,4 +18,4 @@ S = "${WORKDIR}/git" | |||
18 | 18 | ||
19 | FILES:${PN} += "/linuxrc /fat" | 19 | FILES:${PN} += "/linuxrc /fat" |
20 | 20 | ||
21 | COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" | 21 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb index 2a17d76f..caa18297 100644 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb | |||
@@ -32,4 +32,5 @@ do_install () { | |||
32 | 32 | ||
33 | FILES:${PN} = "/" | 33 | FILES:${PN} = "/" |
34 | 34 | ||
35 | COMPATIBLE_MACHINE = "(mx8mp)" | 35 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
36 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" | ||
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb index d4a48627..6ff88860 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" |
5 | 5 | ||
6 | DEPENDS = "imx-vpu-hantro" | 6 | DEPENDS = "imx-vpu-hantro" |
7 | DEPENDS:append:mx8mp = " imx-vpu-hantro-vc" | 7 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" |
8 | 8 | ||
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
10 | ${FSL_MIRROR}/${BP}.tar.gz \ | 10 | ${FSL_MIRROR}/${BP}.tar.gz \ |
@@ -12,9 +12,9 @@ SRC_URI = " \ | |||
12 | SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b" | 12 | SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b" |
13 | SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8" | 13 | SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8" |
14 | 14 | ||
15 | PLATFORM:mx8mm = "IMX8MM" | 15 | PLATFORM:mx8mm-nxp-bsp = "IMX8MM" |
16 | PLATFORM:mx8mq = "IMX8MQ" | 16 | PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" |
17 | PLATFORM:mx8mp = "IMX8MP" | 17 | PLATFORM:mx8mp-nxp-bsp = "IMX8MP" |
18 | 18 | ||
19 | EXTRA_OEMAKE = " \ | 19 | EXTRA_OEMAKE = " \ |
20 | CROSS_COMPILE="${HOST_PREFIX}" \ | 20 | CROSS_COMPILE="${HOST_PREFIX}" \ |
@@ -28,4 +28,4 @@ do_install () { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 30 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
31 | COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" | 31 | COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" |
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb index 84c71610..04340f30 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb | |||
@@ -14,9 +14,9 @@ inherit fsl-eula-unpack use-imx-headers | |||
14 | 14 | ||
15 | PARALLEL_MAKE="-j 1" | 15 | PARALLEL_MAKE="-j 1" |
16 | 16 | ||
17 | PLATFORM:mx8mm = "IMX8MM" | 17 | PLATFORM:mx8mm-nxp-bsp = "IMX8MM" |
18 | PLATFORM:mx8mq = "IMX8MQ" | 18 | PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" |
19 | PLATFORM:mx8mp = "IMX8MP" | 19 | PLATFORM:mx8mp-nxp-bsp = "IMX8MP" |
20 | 20 | ||
21 | EXTRA_OEMAKE = " \ | 21 | EXTRA_OEMAKE = " \ |
22 | CROSS_COMPILE="${HOST_PREFIX}" \ | 22 | CROSS_COMPILE="${HOST_PREFIX}" \ |
@@ -32,4 +32,5 @@ FILES:${PN} += "/unit_tests" | |||
32 | 32 | ||
33 | RDEPENDS:${PN} += "imx-vpu-hantro-daemon" | 33 | RDEPENDS:${PN} += "imx-vpu-hantro-daemon" |
34 | 34 | ||
35 | COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" | 35 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
36 | COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" | ||
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb index 95252dae..77c81f19 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb | |||
@@ -29,4 +29,4 @@ do_install() { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | # Compatible only for i.MX with Chips&Media VPU | 31 | # Compatible only for i.MX with Chips&Media VPU |
32 | COMPATIBLE_MACHINE = "(mx6q|mx6dl)" | 32 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)" |
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb index e7c8a326..5b53068c 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb | |||
@@ -24,4 +24,4 @@ SYSTEMD_AUTO_ENABLE = "enable" | |||
24 | FILES:${PN} = "${libdir} /opt" | 24 | FILES:${PN} = "${libdir} /opt" |
25 | INSANE_SKIP:${PN} = "file-rdeps already-stripped" | 25 | INSANE_SKIP:${PN} = "file-rdeps already-stripped" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mx8mp)" | 27 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" |
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb index 4411c351..64fe3bf1 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb | |||
@@ -88,4 +88,4 @@ INSANE_SKIP:${PN} = "rpaths" | |||
88 | 88 | ||
89 | RDEPENDS:${PN} = "libdrm libpython3" | 89 | RDEPENDS:${PN} = "libdrm libpython3" |
90 | 90 | ||
91 | COMPATIBLE_MACHINE = "(mx8mp)" | 91 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" |
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb index 38481b54..3866ab5b 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb | |||
@@ -32,9 +32,9 @@ PACKAGECONFIG ?= " " | |||
32 | PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" | 32 | PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" |
33 | PACKAGECONFIG:append:imxipu = " ipu" | 33 | PACKAGECONFIG:append:imxipu = " ipu" |
34 | PACKAGECONFIG:append:imxpxp = " pxp" | 34 | PACKAGECONFIG:append:imxpxp = " pxp" |
35 | PACKAGECONFIG:append:mx8m = " ion dwl" | 35 | PACKAGECONFIG:append:mx8m-nxp-bsp = " ion dwl" |
36 | PACKAGECONFIG:append:mx8qm = " ion" | 36 | PACKAGECONFIG:append:mx8qm-nxp-bsp = " ion" |
37 | PACKAGECONFIG:append:mx8qxp = " ion" | 37 | PACKAGECONFIG:append:mx8qxp-nxp-bsp = " ion" |
38 | 38 | ||
39 | HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" | 39 | HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" |
40 | 40 | ||
@@ -51,4 +51,4 @@ do_install_ptest_base() { | |||
51 | install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH} | 51 | install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH} |
52 | } | 52 | } |
53 | 53 | ||
54 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 54 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb index a3a732ef..0a0a1d9c 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb | |||
@@ -27,6 +27,6 @@ do_install () { | |||
27 | ln -sf uboot-mxsboot ${D}${bindir}/mxsboot | 27 | ln -sf uboot-mxsboot ${D}${bindir}/mxsboot |
28 | } | 28 | } |
29 | 29 | ||
30 | COMPATIBLE_MACHINE:class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" | 30 | COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp)" |
31 | 31 | ||
32 | BBCLASSEXTEND = "native nativesdk" | 32 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb index 21989ae5..ec5298b6 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb | |||
@@ -12,7 +12,7 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native lzop-native" | |||
12 | 12 | ||
13 | # Location known to imx-boot component, where U-Boot artifacts | 13 | # Location known to imx-boot component, where U-Boot artifacts |
14 | # should be additionally deployed. | 14 | # should be additionally deployed. |
15 | # See below note above do_deploy:append:mx8m for the purpose of | 15 | # See below note above do_deploy:append:mx8m-nxp-bsp for the purpose of |
16 | # this delopyment location | 16 | # this delopyment location |
17 | BOOT_TOOLS = "imx-boot-tools" | 17 | BOOT_TOOLS = "imx-boot-tools" |
18 | 18 | ||
@@ -28,4 +28,4 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ | |||
28 | HOSTSTRIP=true' | 28 | HOSTSTRIP=true' |
29 | 29 | ||
30 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 30 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
31 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" | 31 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb index 5443ceac..500b2de0 100644 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb | |||
@@ -8,5 +8,5 @@ require u-boot-imx_${PV}.bb | |||
8 | require u-boot-mfgtool.inc | 8 | require u-boot-mfgtool.inc |
9 | 9 | ||
10 | UUU_BOOTLOADER_TAGGED = "" | 10 | UUU_BOOTLOADER_TAGGED = "" |
11 | UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" | 11 | UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" |
12 | UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" | 12 | UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" |
diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb index 96552eef..21883af8 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb | |||
@@ -10,13 +10,13 @@ PROVIDES += "u-boot" | |||
10 | inherit uuu_bootloader_tag | 10 | inherit uuu_bootloader_tag |
11 | 11 | ||
12 | UUU_BOOTLOADER = "" | 12 | UUU_BOOTLOADER = "" |
13 | UUU_BOOTLOADER:mx6 = "${UBOOT_BINARY}" | 13 | UUU_BOOTLOADER:mx6-nxp-bsp = "${UBOOT_BINARY}" |
14 | UUU_BOOTLOADER:mx7 = "${UBOOT_BINARY}" | 14 | UUU_BOOTLOADER:mx7-nxp-bsp = "${UBOOT_BINARY}" |
15 | UUU_BOOTLOADER_TAGGED = "" | 15 | UUU_BOOTLOADER_TAGGED = "" |
16 | UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-tagged.${UBOOT_SUFFIX}" | 16 | UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" |
17 | UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-tagged.${UBOOT_SUFFIX}" | 17 | UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" |
18 | 18 | ||
19 | do_deploy:append:mx8m() { | 19 | do_deploy:append:mx8m-nxp-bsp() { |
20 | # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary | 20 | # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary |
21 | if [ -n "${UBOOT_CONFIG}" ] | 21 | if [ -n "${UBOOT_CONFIG}" ] |
22 | then | 22 | then |
@@ -38,4 +38,4 @@ do_deploy:append:mx8m() { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 40 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
41 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8|use-mainline-bsp)" | 41 | COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp)" |
diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb index dedcbe84..caa349b2 100644 --- a/recipes-devtools/uuu/uuu_git.bb +++ b/recipes-devtools/uuu/uuu_git.bb | |||
@@ -17,6 +17,6 @@ S = "${WORKDIR}/git" | |||
17 | 17 | ||
18 | DEPENDS = "libusb zlib bzip2 openssl" | 18 | DEPENDS = "libusb zlib bzip2 openssl" |
19 | 19 | ||
20 | COMPATIBLE_MACHINE = "(imx)" | 20 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
21 | 21 | ||
22 | BBCLASSEXTEND = "native nativesdk" | 22 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index f4c932ea..ba36260e 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc | |||
@@ -14,7 +14,7 @@ COMPATIBLE_HOST:armv4 = 'null' | |||
14 | COMPATIBLE_HOST:armv5 = 'null' | 14 | COMPATIBLE_HOST:armv5 = 'null' |
15 | COMPATIBLE_HOST:armv6 = 'null' | 15 | COMPATIBLE_HOST:armv6 = 'null' |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(imx|qoriq)" | 17 | COMPATIBLE_MACHINE = "(imx-nxp-bsp|qoriq)" |
18 | 18 | ||
19 | DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" | 19 | DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" |
20 | DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" | 20 | DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" |
diff --git a/recipes-extended/jailhouse/jailhouse_0.12.bb b/recipes-extended/jailhouse/jailhouse_0.12.bb index 43b4cdf5..bdd55985 100644 --- a/recipes-extended/jailhouse/jailhouse_0.12.bb +++ b/recipes-extended/jailhouse/jailhouse_0.12.bb | |||
@@ -119,4 +119,4 @@ RDEPENDS:pyjailhouse = " \ | |||
119 | 119 | ||
120 | INSANE_SKIP:${PN} = "ldflags" | 120 | INSANE_SKIP:${PN} = "ldflags" |
121 | 121 | ||
122 | COMPATIBLE_MACHINE = "(mx8m)" | 122 | COMPATIBLE_MACHINE = "(mx8m-nxp-bsp)" |
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb index d832a926..415587a8 100644 --- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb +++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb | |||
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
5 | inherit packagegroup | 5 | inherit packagegroup |
6 | 6 | ||
7 | ISP_PKGS ?= "" | 7 | ISP_PKGS ?= "" |
8 | ISP_PKGS:mx8mp = " \ | 8 | ISP_PKGS:mx8mp-nxp-bsp = " \ |
9 | isp-imx \ | 9 | isp-imx \ |
10 | basler-camera \ | 10 | basler-camera \ |
11 | basler-camera-dev \ | 11 | basler-camera-dev \ |
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb index 59f58976..d0367fdb 100644 --- a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb +++ b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb | |||
@@ -46,4 +46,4 @@ RDEPENDS:${PN}-extfs = " \ | |||
46 | e2fsprogs-mke2fs \ | 46 | e2fsprogs-mke2fs \ |
47 | e2fsprogs-e2fsck \ | 47 | e2fsprogs-e2fsck \ |
48 | " | 48 | " |
49 | COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" | 49 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-graphics/drm/libdrm_2.4.107.imx.bb b/recipes-graphics/drm/libdrm_2.4.107.imx.bb index cf5dadd4..b732e82a 100644 --- a/recipes-graphics/drm/libdrm_2.4.107.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.107.imx.bb | |||
@@ -18,7 +18,7 @@ SRCREV = "a7316e7d67b7708f40ffe469858dae07f14fe21a" | |||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | DEFAULT_PREFERENCE = "-1" | 20 | DEFAULT_PREFERENCE = "-1" |
21 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 21 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
22 | 22 | ||
23 | inherit meson pkgconfig manpages | 23 | inherit meson pkgconfig manpages |
24 | 24 | ||
diff --git a/recipes-graphics/images/core-image-weston.bbappend b/recipes-graphics/images/core-image-weston.bbappend index 77d2fe74..0d4a0c6f 100644 --- a/recipes-graphics/images/core-image-weston.bbappend +++ b/recipes-graphics/images/core-image-weston.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | # FIXME: i.MX6SL cannot use mesa for Graphics and it lacks GL support, | 1 | # FIXME: i.MX6SL cannot use mesa for Graphics and it lacks GL support, |
2 | # so for now we skip it. | 2 | # so for now we skip it. |
3 | CORE_IMAGE_BASE_INSTALL:remove:mx6sl = "clutter-1.0-examples" | 3 | CORE_IMAGE_BASE_INSTALL:remove:mx6sl-nxp-bsp = "clutter-1.0-examples" |
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index c272d1b7..bd041582 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | |||
@@ -13,13 +13,13 @@ S = "${WORKDIR}/git" | |||
13 | 13 | ||
14 | inherit cmake pkgconfig perlnative python3native | 14 | inherit cmake pkgconfig perlnative python3native |
15 | 15 | ||
16 | PACKAGECONFIG_BACKEND:mx6 = " \ | 16 | PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \ |
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ |
18 | bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ | 18 | bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ |
19 | '', d), d)} \ | 19 | '', d), d)} \ |
20 | " | 20 | " |
21 | PACKAGECONFIG_BACKEND:mx7 = "${PACKAGECONFIG_BACKEND:mx6}" | 21 | PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" |
22 | PACKAGECONFIG_BACKEND:mx8 = "waffle" | 22 | PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" |
23 | 23 | ||
24 | PACKAGECONFIG_GPU2D = "" | 24 | PACKAGECONFIG_GPU2D = "" |
25 | PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" | 25 | PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 1b3a0169..3dd2f55c 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |||
@@ -18,7 +18,7 @@ DEPENDS += " \ | |||
18 | '', d)} \ | 18 | '', d)} \ |
19 | " | 19 | " |
20 | DEPENDS:append:imxdrm = " libdrm wayland" | 20 | DEPENDS:append:imxdrm = " libdrm wayland" |
21 | DEPENDS:append:mx8 = " patchelf-native" | 21 | DEPENDS:append:mx8-nxp-bsp = " patchelf-native" |
22 | 22 | ||
23 | # imx-gpu-viv does not provide everything it needs to for virtual/libgl | 23 | # imx-gpu-viv does not provide everything it needs to for virtual/libgl |
24 | # on x11 backend or on Wayland backend with XWayland support. | 24 | # on x11 backend or on Wayland backend with XWayland support. |
@@ -31,12 +31,12 @@ EXTRA_PROVIDES:append:imxgpu3d = " \ | |||
31 | virtual/libgles1 \ | 31 | virtual/libgles1 \ |
32 | virtual/libgles2 \ | 32 | virtual/libgles2 \ |
33 | " | 33 | " |
34 | EXTRA_PROVIDES:append:mx8 = " \ | 34 | EXTRA_PROVIDES:append:mx8-nxp-bsp = " \ |
35 | virtual/libgbm \ | 35 | virtual/libgbm \ |
36 | " | 36 | " |
37 | PROVIDES_OPENVX = "" | 37 | PROVIDES_OPENVX = "" |
38 | PROVIDES_OPENVX:mx8 = "virtual/libopenvx" | 38 | PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx" |
39 | PROVIDES_OPENVX:mx8mm = "" | 39 | PROVIDES_OPENVX:mx8mm-nxp-bsp = "" |
40 | PROVIDES += " \ | 40 | PROVIDES += " \ |
41 | imx-gpu-viv \ | 41 | imx-gpu-viv \ |
42 | libgal-imx \ | 42 | libgal-imx \ |
@@ -56,12 +56,7 @@ PE = "1" | |||
56 | 56 | ||
57 | inherit fsl-eula-unpack features_check | 57 | inherit fsl-eula-unpack features_check |
58 | 58 | ||
59 | # For i.MX 6 & 7, support Wayland and Framebuffer | 59 | REQUIRED_DISTRO_FEATURES:mx8-nxp-bsp = "wayland" |
60 | CONFLICT_DISTRO_FEATURES:mx6 = \ | ||
61 | "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'x11', d)}" | ||
62 | CONFLICT_DISTRO_FEATURES:mx7 = "${CONFLICT_DISTRO_FEATURES:mx6}" | ||
63 | # For i.MX 8, support Wayland only | ||
64 | REQUIRED_DISTRO_FEATURES:mx8 = "wayland" | ||
65 | 60 | ||
66 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 61 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
67 | 62 | ||
@@ -72,7 +67,7 @@ PACKAGECONFIG[valgrind] = "" | |||
72 | 67 | ||
73 | # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below | 68 | # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below |
74 | IMX_PACKAGES_GBM = "" | 69 | IMX_PACKAGES_GBM = "" |
75 | IMX_PACKAGES_GBM:mx8 = "libgbm-imx libgbm-imx-dev" | 70 | IMX_PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" |
76 | PACKAGES =+ "libclc-imx libclc-imx-dev \ | 71 | PACKAGES =+ "libclc-imx libclc-imx-dev \ |
77 | libgl-imx libgl-imx-dev \ | 72 | libgl-imx libgl-imx-dev \ |
78 | libgles1-imx libgles1-imx-dev \ | 73 | libgles1-imx libgles1-imx-dev \ |
@@ -140,23 +135,23 @@ python __anonymous() { | |||
140 | } | 135 | } |
141 | 136 | ||
142 | IS_MX6SL = "0" | 137 | IS_MX6SL = "0" |
143 | IS_MX6SL:mx6sl = "1" | 138 | IS_MX6SL:mx6sl-nxp-bsp = "1" |
144 | 139 | ||
145 | IS_MX8 = "0" | 140 | IS_MX8 = "0" |
146 | IS_MX8:mx8 = "1" | 141 | IS_MX8:mx8-nxp-bsp = "1" |
147 | 142 | ||
148 | PACKAGE_FP_TYPE = "hardfp" | 143 | PACKAGE_FP_TYPE = "hardfp" |
149 | 144 | ||
150 | HAS_GBM = "false" | 145 | HAS_GBM = "false" |
151 | HAS_GBM:mx8 = "true" | 146 | HAS_GBM:mx8-nxp-bsp = "true" |
152 | 147 | ||
153 | IMX_SOC = "IMX_SOC_NOT_SET" | 148 | IMX_SOC = "IMX_SOC_NOT_SET" |
154 | IMX_SOC:mx8qm = "mx8qm" | 149 | IMX_SOC:mx8qm-nxp-bsp = "mx8qm" |
155 | IMX_SOC:mx8mp = "mx8mp" | 150 | IMX_SOC:mx8mp-nxp-bsp = "mx8mp" |
156 | IMX_SOC:mx8mq = "mx8mq" | 151 | IMX_SOC:mx8mq-nxp-bsp = "mx8mq" |
157 | IMX_SOC:mx8qxp = "mx8qxp" | 152 | IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp" |
158 | IMX_SOC:mx8mn = "mx8mn" | 153 | IMX_SOC:mx8mn-nxp-bsp = "mx8mn" |
159 | IMX_SOC:mx8ulp = "mx8ulp" | 154 | IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" |
160 | 155 | ||
161 | LIBVULKAN_VERSION_MAJOR = "1" | 156 | LIBVULKAN_VERSION_MAJOR = "1" |
162 | LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.1.6" | 157 | LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.1.6" |
@@ -262,9 +257,9 @@ INSANE_SKIP:libgal-imx += "build-deps" | |||
262 | 257 | ||
263 | FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}" | 258 | FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}" |
264 | 259 | ||
265 | FILES:libgbm-imx:mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" | 260 | FILES:libgbm-imx:mx8-nxp-bsp = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" |
266 | FILES:libgbm-imx-dev:mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" | 261 | FILES:libgbm-imx-dev:mx8-nxp-bsp = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" |
267 | RDEPENDS:libgbm-imx:append:mx8 = " libdrm" | 262 | RDEPENDS:libgbm-imx:append:mx8-nxp-bsp = " libdrm" |
268 | INSANE_SKIP:libgbm-imx += "dev-so" | 263 | INSANE_SKIP:libgbm-imx += "dev-so" |
269 | 264 | ||
270 | FILES:libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" | 265 | FILES:libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" |
@@ -327,5 +322,3 @@ FILES:imx-gpu-viv-demos = "/opt" | |||
327 | INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps" | 322 | INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps" |
328 | 323 | ||
329 | FILES:libnn-imx = "${libdir}/libNN*${SOLIBS}" | 324 | FILES:libnn-imx = "${libdir}/libNN*${SOLIBS}" |
330 | |||
331 | # COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb index a2f23731..ea3b0bde 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb | |||
@@ -7,4 +7,4 @@ require imx-gpu-viv-6.inc | |||
7 | SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40" | 7 | SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40" |
8 | SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1" | 8 | SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" | 10 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb index b69bd041..7fc1bc4e 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb | |||
@@ -3,4 +3,4 @@ require imx-gpu-viv-6.inc | |||
3 | SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb" | 3 | SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb" |
4 | SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4" | 4 | SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4" |
5 | 5 | ||
6 | COMPATIBLE_MACHINE = "(mx8)" | 6 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend index 380273a8..e88f558d 100644 --- a/recipes-graphics/waffle/waffle_%.bbappend +++ b/recipes-graphics/waffle/waffle_%.bbappend | |||
@@ -8,8 +8,8 @@ SRC_URI += " \ | |||
8 | PACKAGECONFIG_IMXGPU_X11 = "" | 8 | PACKAGECONFIG_IMXGPU_X11 = "" |
9 | PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx" | 9 | PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx" |
10 | PACKAGECONFIG_IMXGPU_GBM = "gbm" | 10 | PACKAGECONFIG_IMXGPU_GBM = "gbm" |
11 | PACKAGECONFIG_IMXGPU_GBM:mx6 = "" | 11 | PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp = "" |
12 | PACKAGECONFIG_IMXGPU_GBM:mx7 = "" | 12 | PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp = "" |
13 | PACKAGECONFIG:imxgpu = " \ | 13 | PACKAGECONFIG:imxgpu = " \ |
14 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ | 14 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ |
15 | bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \ | 15 | bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \ |
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 6a5ede37..7aceb6b1 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend | |||
@@ -6,19 +6,19 @@ IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu2d = "opengl" | |||
6 | IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = "" | 6 | IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = "" |
7 | REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}" | 7 | REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}" |
8 | 8 | ||
9 | SRC_URI:append:mx6sl = " file://weston.config" | 9 | SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config" |
10 | 10 | ||
11 | # To customize weston.ini, start by setting the desired assignment in weston.ini, | 11 | # To customize weston.ini, start by setting the desired assignment in weston.ini, |
12 | # commented out. For example: | 12 | # commented out. For example: |
13 | # #xwayland=true | 13 | # #xwayland=true |
14 | # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. | 14 | # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. |
15 | INI_UNCOMMENT_ASSIGNMENTS:append:imx = " \ | 15 | INI_UNCOMMENT_ASSIGNMENTS:append:imx-nxp-bsp = " \ |
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ | 16 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ |
17 | " | 17 | " |
18 | INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \ | 18 | INI_UNCOMMENT_ASSIGNMENTS:append:mx8-nxp-bsp = " \ |
19 | repaint-window=16 \ | 19 | repaint-window=16 \ |
20 | " | 20 | " |
21 | INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \ | 21 | INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \ |
22 | gbm-format=argb8888 \ | 22 | gbm-format=argb8888 \ |
23 | \\[shell\\] \ | 23 | \\[shell\\] \ |
24 | size=1920x1080 \ | 24 | size=1920x1080 \ |
@@ -28,8 +28,8 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \ | |||
28 | # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest | 28 | # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest |
29 | # rendering code. | 29 | # rendering code. |
30 | INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" | 30 | INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" |
31 | INI_UNCOMMENT_USE_G2D:mx8qm = "" | 31 | INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp = "" |
32 | INI_UNCOMMENT_USE_G2D:mx8qxp = "" | 32 | INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp = "" |
33 | INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \ | 33 | INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \ |
34 | ${INI_UNCOMMENT_USE_G2D} \ | 34 | ${INI_UNCOMMENT_USE_G2D} \ |
35 | " | 35 | " |
diff --git a/recipes-graphics/wayland/weston-init/imx/weston.ini b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini index 3e8be42f..3e8be42f 100644 --- a/recipes-graphics/wayland/weston-init/imx/weston.ini +++ b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini | |||
diff --git a/recipes-graphics/wayland/weston-init/mx6sl/weston.config b/recipes-graphics/wayland/weston-init/mx6sl-nxp-bsp/weston.config index 6456cd24..6456cd24 100755 --- a/recipes-graphics/wayland/weston-init/mx6sl/weston.config +++ b/recipes-graphics/wayland/weston-init/mx6sl-nxp-bsp/weston.config | |||
diff --git a/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6/pointercal.xinput b/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6-nxp-bsp/pointercal.xinput index ba34b89f..ba34b89f 100644 --- a/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6/pointercal.xinput +++ b/recipes-graphics/xinput-calibrator/pointercal-xinput/mx6-nxp-bsp/pointercal.xinput | |||
diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb index 6944184f..1a272304 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb | |||
@@ -62,4 +62,4 @@ FILES:${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIB | |||
62 | FILES:xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi" | 62 | FILES:xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi" |
63 | 63 | ||
64 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 64 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
65 | COMPATIBLE_MACHINE = "(mx6|mx7ulp)" | 65 | COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7ulp-nxp-bsp)" |
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5-generic-bsp/xorg.conf index a99e6f24..a99e6f24 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5-generic-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf index b89bed60..b89bed60 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl-nxp-bsp/xorg.conf index de3905ab..de3905ab 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100755 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx-nxp-bsp/xorg.conf index de3905ab..de3905ab 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7-nxp-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp-nxp-bsp/xorg.conf index de6307a3..de6307a3 100755 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp-nxp-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs-generic-bsp/xorg.conf index 79b6c0fc..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mxs-generic-bsp/xorg.conf | |||
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index be3c3817..c956245b 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | |||
@@ -19,6 +19,6 @@ SRC_URI:append:imxgpu = " \ | |||
19 | 19 | ||
20 | IMX_OPENGL_PKGCONFIGS_REMOVE = "" | 20 | IMX_OPENGL_PKGCONFIGS_REMOVE = "" |
21 | IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" | 21 | IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" |
22 | OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 22 | OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
23 | OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 23 | OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
24 | OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx" | 24 | OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx" |
diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend index b3e79e09..c63212d0 100644 --- a/recipes-graphics/xwayland/xwayland_%.bbappend +++ b/recipes-graphics/xwayland/xwayland_%.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMX_OPENGL_PKGCONFIGS_REMOVE = "" | 1 | IMX_OPENGL_PKGCONFIGS_REMOVE = "" |
2 | IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" | 2 | IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" |
3 | OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 3 | OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
4 | OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 4 | OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4+fslc.bb index 18144f41..459f88d4 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4+fslc.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4+fslc.bb | |||
@@ -17,4 +17,4 @@ S = "${WORKDIR}/git" | |||
17 | inherit module | 17 | inherit module |
18 | 18 | ||
19 | KERNEL_MODULE_AUTOLOAD = "galcore" | 19 | KERNEL_MODULE_AUTOLOAD = "galcore" |
20 | COMPATIBLE_MACHINE = "(imx)" | 20 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb index a3433b7c..37b6d2f7 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb | |||
@@ -23,4 +23,4 @@ inherit module | |||
23 | EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m" | 23 | EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m" |
24 | 24 | ||
25 | KERNEL_MODULE_AUTOLOAD = "galcore" | 25 | KERNEL_MODULE_AUTOLOAD = "galcore" |
26 | COMPATIBLE_MACHINE = "(imx)" | 26 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb index e9a09ad7..71265e53 100644 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb | |||
@@ -16,4 +16,4 @@ S = "${WORKDIR}/git/vvcam/v4l2" | |||
16 | 16 | ||
17 | inherit module | 17 | inherit module |
18 | 18 | ||
19 | COMPATIBLE_MACHINE = "(mx8mp)" | 19 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" |
diff --git a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig index 6ca0833e..6ca0833e 100644 --- a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig | |||
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig index ab8c97e3..ab8c97e3 100644 --- a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig | |||
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.10.bb b/recipes-kernel/linux/linux-fslc-imx_5.10.bb index 5078efa4..1819dfde 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.10.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.10.bb | |||
@@ -87,4 +87,4 @@ LOCALVERSION = "-5.10.52-2.1.0" | |||
87 | 87 | ||
88 | DEFAULT_PREFERENCE = "1" | 88 | DEFAULT_PREFERENCE = "1" |
89 | 89 | ||
90 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 90 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-kernel/linux/linux-fslc-lts/mxs/defconfig b/recipes-kernel/linux/linux-fslc-lts/mxs-generic-bsp/defconfig index a913c0dd..a913c0dd 100644 --- a/recipes-kernel/linux/linux-fslc-lts/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc-lts/mxs-generic-bsp/defconfig | |||
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb index c3410a59..4320280e 100644 --- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb +++ b/recipes-kernel/linux/linux-fslc-lts_5.10.bb | |||
@@ -24,4 +24,4 @@ LINUX_VERSION = "5.10.93" | |||
24 | KBRANCH = "5.10.x+fslc" | 24 | KBRANCH = "5.10.x+fslc" |
25 | SRCREV = "de6a8455baae279feddb56c99056aa075175cd68" | 25 | SRCREV = "de6a8455baae279feddb56c99056aa075175cd68" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs-generic-bsp/defconfig index 67e47841..67e47841 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs-generic-bsp/defconfig | |||
diff --git a/recipes-kernel/linux/linux-fslc_5.15.bb b/recipes-kernel/linux/linux-fslc_5.15.bb index 1e88adba..23fc62ac 100644 --- a/recipes-kernel/linux/linux-fslc_5.15.bb +++ b/recipes-kernel/linux/linux-fslc_5.15.bb | |||
@@ -24,4 +24,4 @@ LINUX_VERSION = "5.15.16" | |||
24 | KBRANCH = "5.15.x+fslc" | 24 | KBRANCH = "5.15.x+fslc" |
25 | SRCREV = "d084d166324389d09f73d8f2e91b989d69432335" | 25 | SRCREV = "d084d166324389d09f73d8f2e91b989d69432335" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |
diff --git a/recipes-kernel/linux/linux-imx/imx/defconfig b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig index 6ca0833e..6ca0833e 100644 --- a/recipes-kernel/linux/linux-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig | |||
diff --git a/recipes-kernel/linux/linux-imx/mx8/defconfig b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig index 775fd503..775fd503 100644 --- a/recipes-kernel/linux/linux-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig | |||
diff --git a/recipes-kernel/linux/linux-imx_5.10.bb b/recipes-kernel/linux/linux-imx_5.10.bb index e287fa39..1a454b82 100644 --- a/recipes-kernel/linux/linux-imx_5.10.bb +++ b/recipes-kernel/linux/linux-imx_5.10.bb | |||
@@ -30,4 +30,4 @@ LINUX_VERSION = "5.10.72" | |||
30 | 30 | ||
31 | DEFAULT_PREFERENCE = "1" | 31 | DEFAULT_PREFERENCE = "1" |
32 | 32 | ||
33 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 33 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index d76c45d1..8a13d4c1 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend | |||
@@ -6,6 +6,6 @@ IMX_PATCH = " \ | |||
6 | file://0005-add-ak4458-conf-for-multichannel-support.patch \ | 6 | file://0005-add-ak4458-conf-for-multichannel-support.patch \ |
7 | file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ | 7 | file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ |
8 | " | 8 | " |
9 | SRC_URI:append:imx = "${IMX_PATCH}" | 9 | SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}" |
10 | 10 | ||
11 | PACKAGE_ARCH:imx = "${MACHINE_SOCARCH}" | 11 | PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}" |
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb index 96b6392d..6a665729 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb | |||
@@ -33,4 +33,4 @@ FILES:${PN} += "${libdir}/alsa-lib/libasound_*.so" | |||
33 | FILES:${PN}-dbg += "${libdir}/alsa-lib/.debug" | 33 | FILES:${PN}-dbg += "${libdir}/alsa-lib/.debug" |
34 | FILES:${PN}-dev += "${libdir}/alsa-lib/*.la" | 34 | FILES:${PN}-dev += "${libdir}/alsa-lib/*.la" |
35 | 35 | ||
36 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 36 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb index 73d8c429..2d16a3f2 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb | |||
@@ -23,4 +23,4 @@ inherit meson pkgconfig upstream-version-is-even | |||
23 | FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" | 23 | FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" |
24 | FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" | 24 | FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" |
25 | 25 | ||
26 | COMPATIBLE_MACHINE = "(imx)" | 26 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb index aec2bb01..530db622 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb | |||
@@ -1,14 +1,14 @@ | |||
1 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc | 1 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc |
2 | 2 | ||
3 | DEPENDS:append:imxgpu2d = " virtual/libg2d" | 3 | DEPENDS:append:imxgpu2d = " virtual/libg2d" |
4 | DEPENDS:append:mx8 = " libdrm" | 4 | DEPENDS:append:mx8-nxp-bsp = " libdrm" |
5 | 5 | ||
6 | PACKAGECONFIG:append:mx8 = " kms tinycompress" | 6 | PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress" |
7 | 7 | ||
8 | DEFAULT_PREFERENCE = "-1" | 8 | DEFAULT_PREFERENCE = "-1" |
9 | 9 | ||
10 | PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}" | 10 | PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}" |
11 | PACKAGE_ARCH:mx8 = "${MACHINE_SOCARCH}" | 11 | PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_SOCARCH}" |
12 | 12 | ||
13 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https;branch=master" | 13 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https;branch=master" |
14 | SRCBRANCH = "MM_04.06.01_2105_L5.10.y" | 14 | SRCBRANCH = "MM_04.06.01_2105_L5.10.y" |
@@ -160,4 +160,4 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" | |||
160 | # include fragment shaders | 160 | # include fragment shaders |
161 | FILES:${PN}-opengl += "/usr/share/*.fs" | 161 | FILES:${PN}-opengl += "/usr/share/*.fs" |
162 | 162 | ||
163 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 163 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb index 5dd672bf..835264ec 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb | |||
@@ -99,4 +99,4 @@ def get_opengl_cmdline_list(switch_name, options, d): | |||
99 | 99 | ||
100 | CVE_PRODUCT += "gst-plugins-base" | 100 | CVE_PRODUCT += "gst-plugins-base" |
101 | 101 | ||
102 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 102 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb index 050bc6ee..dd2996b0 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb | |||
@@ -74,4 +74,4 @@ EXTRA_OEMESON += " \ | |||
74 | 74 | ||
75 | FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" | 75 | FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" |
76 | 76 | ||
77 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 77 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb index 41de1369..ed2da34b 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb | |||
@@ -42,8 +42,8 @@ PACKAGECONFIG:append:imxpxp = " pxp" | |||
42 | # The 2D blitter sinks require an MXC framebuffer, which | 42 | # The 2D blitter sinks require an MXC framebuffer, which |
43 | # is not available anymore on the i.MX8 (since these SoCs | 43 | # is not available anymore on the i.MX8 (since these SoCs |
44 | # now use KMS instead of the old Linux framebuffer). | 44 | # now use KMS instead of the old Linux framebuffer). |
45 | PACKAGECONFIG:append:mx6 = " imx2dvideosink v4l2" | 45 | PACKAGECONFIG:append:mx6-nxp-bsp = " imx2dvideosink v4l2" |
46 | PACKAGECONFIG:append:mx7 = " imx2dvideosink" | 46 | PACKAGECONFIG:append:mx7-nxp-bsp = " imx2dvideosink" |
47 | 47 | ||
48 | PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}" | 48 | PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}" |
49 | PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled," | 49 | PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled," |
@@ -59,4 +59,4 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc | |||
59 | # the following line is required to produce one package for each plugin | 59 | # the following line is required to produce one package for each plugin |
60 | PACKAGES_DYNAMIC = "^${PN}-.*" | 60 | PACKAGES_DYNAMIC = "^${PN}-.*" |
61 | 61 | ||
62 | COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d|mx8)" | 62 | COMPATIBLE_MACHINE = "(mx6dl-nxp-bsp|mx6q-nxp-bsp|mx6sl-nxp-bsp|mx6sx-nxp-bsp|mx6ul-nxp-bsp|mx6ull-nxp-bsp|mx7d-nxp-bsp|mx8-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb index 0625fbaa..15c17f4f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb | |||
@@ -42,4 +42,4 @@ EXTRA_OEMESON += " \ | |||
42 | FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" | 42 | FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" |
43 | FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" | 43 | FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" |
44 | 44 | ||
45 | COMPATIBLE_MACHINE = "(imx)" | 45 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb index eaaf078b..4a8d5995 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb | |||
@@ -29,4 +29,4 @@ GIR_MESON_DISABLE_FLAG = "disabled" | |||
29 | # Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well | 29 | # Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well |
30 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc | 30 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc |
31 | 31 | ||
32 | COMPATIBLE_MACHINE = "(imx)" | 32 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb index c474f9b0..8de623fc 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb | |||
@@ -79,4 +79,4 @@ CVE_PRODUCT = "gstreamer" | |||
79 | 79 | ||
80 | PTEST_BUILD_HOST_FILES = "" | 80 | PTEST_BUILD_HOST_FILES = "" |
81 | 81 | ||
82 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 82 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb index b5fb8890..2de5df53 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb | |||
@@ -8,8 +8,8 @@ LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" | |||
8 | SECTION = "multimedia" | 8 | SECTION = "multimedia" |
9 | 9 | ||
10 | DEPENDS = "imx-codec imx-parser gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 10 | DEPENDS = "imx-codec imx-parser gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
11 | DEPENDS:append:mx6 = " imx-lib" | 11 | DEPENDS:append:mx6-nxp-bsp = " imx-lib" |
12 | DEPENDS:append:mx7 = " imx-lib" | 12 | DEPENDS:append:mx7-nxp-bsp = " imx-lib" |
13 | DEPENDS:append:imxvpu = " imx-vpuwrap libdrm" | 13 | DEPENDS:append:imxvpu = " imx-vpuwrap libdrm" |
14 | 14 | ||
15 | # For backwards compatibility | 15 | # For backwards compatibility |
@@ -30,14 +30,14 @@ S = "${WORKDIR}/git" | |||
30 | 30 | ||
31 | inherit meson pkgconfig use-imx-headers | 31 | inherit meson pkgconfig use-imx-headers |
32 | 32 | ||
33 | PLATFORM:mx6 = "MX6" | 33 | PLATFORM:mx6-nxp-bsp = "MX6" |
34 | PLATFORM:mx6sl = "MX6SL" | 34 | PLATFORM:mx6sl-nxp-bsp = "MX6SL" |
35 | PLATFORM:mx6sx = "MX6SX" | 35 | PLATFORM:mx6sx-nxp-bsp = "MX6SX" |
36 | PLATFORM:mx6ul = "MX6UL" | 36 | PLATFORM:mx6ul-nxp-bsp = "MX6UL" |
37 | PLATFORM:mx6sll = "MX6SLL" | 37 | PLATFORM:mx6sll-nxp-bsp = "MX6SLL" |
38 | PLATFORM:mx7= "MX7D" | 38 | PLATFORM:mx7-nxp-bsp= "MX7D" |
39 | PLATFORM:mx7ulp= "MX7ULP" | 39 | PLATFORM:mx7ulp-nxp-bsp= "MX7ULP" |
40 | PLATFORM:mx8 = "MX8" | 40 | PLATFORM:mx8-nxp-bsp = "MX8" |
41 | 41 | ||
42 | # Todo add a mechanism to map possible build targets | 42 | # Todo add a mechanism to map possible build targets |
43 | EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ | 43 | EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ |
@@ -49,10 +49,10 @@ PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN | |||
49 | # Add codec list that the beep plugin run-time depended | 49 | # Add codec list that the beep plugin run-time depended |
50 | BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis" | 50 | BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis" |
51 | RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " | 51 | RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " |
52 | RDEPENDS:${PN}:append:mx8qm = " imx-dsp" | 52 | RDEPENDS:${PN}:append:mx8qm-nxp-bsp = " imx-dsp" |
53 | RDEPENDS:${PN}:append:mx8qxp = " imx-dsp" | 53 | RDEPENDS:${PN}:append:mx8qxp-nxp-bsp = " imx-dsp" |
54 | RDEPENDS:${PN}:append:mx8mp = " imx-dsp" | 54 | RDEPENDS:${PN}:append:mx8mp-nxp-bsp = " imx-dsp" |
55 | RDEPENDS:${PN}:append:mx8ulp = " imx-dsp" | 55 | RDEPENDS:${PN}:append:mx8ulp-nxp-bsp = " imx-dsp" |
56 | 56 | ||
57 | # overlaysink rely on G2D, | 57 | # overlaysink rely on G2D, |
58 | # cannot be supported on i.MX6SLL & i.MX6UL & i.MX6ULL & i.MX7D | 58 | # cannot be supported on i.MX6SLL & i.MX6UL & i.MX6ULL & i.MX7D |
@@ -82,4 +82,4 @@ FILES:${PN}-grecorder = "${bindir}/grecorder-1.0" | |||
82 | FILES:${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}" | 82 | FILES:${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}" |
83 | FILES:${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}" | 83 | FILES:${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}" |
84 | 84 | ||
85 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 85 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.6.2.bb b/recipes-multimedia/imx-codec/imx-codec_4.6.2.bb index 46a1b225..3e142694 100644 --- a/recipes-multimedia/imx-codec/imx-codec_4.6.2.bb +++ b/recipes-multimedia/imx-codec/imx-codec_4.6.2.bb | |||
@@ -116,4 +116,4 @@ FILES:${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux | |||
116 | FILES:${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*" | 116 | FILES:${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*" |
117 | 117 | ||
118 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 118 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
119 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 119 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb index fe653c18..f34c466c 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb | |||
@@ -18,4 +18,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | |||
18 | INSANE_SKIP:${PN} = "arch dev-so" | 18 | INSANE_SKIP:${PN} = "arch dev-so" |
19 | 19 | ||
20 | FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm" | 20 | FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm" |
21 | COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)" | 21 | COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb b/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb index fe650eb1..eb90f17f 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb | |||
@@ -19,8 +19,8 @@ EXTRA_OECONF += " \ | |||
19 | RDEPENDS:${PN} += " imx-dsp-codec-ext" | 19 | RDEPENDS:${PN} += " imx-dsp-codec-ext" |
20 | 20 | ||
21 | HIFI4_BIN ?= "hifi4_imx8qmqxp.bin" | 21 | HIFI4_BIN ?= "hifi4_imx8qmqxp.bin" |
22 | HIFI4_BIN:mx8mp = "hifi4_imx8mp.bin" | 22 | HIFI4_BIN:mx8mp-nxp-bsp = "hifi4_imx8mp.bin" |
23 | HIFI4_BIN:mx8ulp = "hifi4_imx8ulp.bin" | 23 | HIFI4_BIN:mx8ulp-nxp-bsp = "hifi4_imx8ulp.bin" |
24 | 24 | ||
25 | do_install:append () { | 25 | do_install:append () { |
26 | # Rename DSP Firmware into hifi4.bin and remove unneeded binary | 26 | # Rename DSP Firmware into hifi4.bin and remove unneeded binary |
@@ -42,4 +42,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | |||
42 | INHIBIT_SYSROOT_STRIP = "1" | 42 | INHIBIT_SYSROOT_STRIP = "1" |
43 | 43 | ||
44 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 44 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
45 | COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)" | 45 | COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb index 83aa656f..7bf6d932 100644 --- a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb +++ b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb | |||
@@ -19,4 +19,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | |||
19 | 19 | ||
20 | FILES:${PN} += "/unit_tests ${datadir}/imx-mm" | 20 | FILES:${PN} += "/unit_tests ${datadir}/imx-mm" |
21 | 21 | ||
22 | COMPATIBLE_MACHINE = "(mx8)" | 22 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.6.2.bb b/recipes-multimedia/imx-parser/imx-parser_4.6.2.bb index 08cdd162..847734a4 100644 --- a/recipes-multimedia/imx-parser/imx-parser_4.6.2.bb +++ b/recipes-multimedia/imx-parser/imx-parser_4.6.2.bb | |||
@@ -41,4 +41,4 @@ FILES:${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}" | |||
41 | 41 | ||
42 | INHIBIT_SYSROOT_STRIP = "1" | 42 | INHIBIT_SYSROOT_STRIP = "1" |
43 | 43 | ||
44 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 44 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.1.bb b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.1.bb index 7fc13c58..d1fc1f76 100644 --- a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.1.bb +++ b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.1.bb | |||
@@ -15,4 +15,4 @@ INSANE_SKIP:${PN} = "already-stripped" | |||
15 | 15 | ||
16 | FILES:${PN} += "${datadir}/imx-mm" | 16 | FILES:${PN} += "${datadir}/imx-mm" |
17 | 17 | ||
18 | COMPATIBLE_MACHINE = "(mx8)" | 18 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.2.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.2.bb index 03702b16..24af9e2b 100644 --- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.2.bb +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.2.bb | |||
@@ -8,7 +8,7 @@ SECTION = "multimedia" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" |
9 | 9 | ||
10 | DEPENDS = "virtual/imxvpu" | 10 | DEPENDS = "virtual/imxvpu" |
11 | DEPENDS:append:mx8mp = " imx-vpu-hantro-vc" | 11 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" | 13 | SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" |
14 | 14 | ||
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb index 2b995b60..97b5f116 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb | |||
@@ -15,10 +15,10 @@ S = "${WORKDIR}/git" | |||
15 | 15 | ||
16 | inherit waf pkgconfig use-imx-headers | 16 | inherit waf pkgconfig use-imx-headers |
17 | 17 | ||
18 | IMX_PLATFORM:mx6 = "imx6" | 18 | IMX_PLATFORM:mx6-nxp-bsp = "imx6" |
19 | IMX_PLATFORM:mx8mq = "imx8m" | 19 | IMX_PLATFORM:mx8mq-nxp-bsp = "imx8m" |
20 | IMX_PLATFORM:mx8mm = "imx8mm" | 20 | IMX_PLATFORM:mx8mm-nxp-bsp = "imx8mm" |
21 | IMX_PLATFORM:mx8mp = "imx8mm" | 21 | IMX_PLATFORM:mx8mp-nxp-bsp = "imx8mm" |
22 | 22 | ||
23 | EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}" | 23 | EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}" |
24 | 24 | ||
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb index 778514fb..660eed3e 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb | |||
@@ -16,6 +16,6 @@ S = "${WORKDIR}/git" | |||
16 | 16 | ||
17 | inherit waf pkgconfig | 17 | inherit waf pkgconfig |
18 | 18 | ||
19 | COMPATIBLE_MACHINE = "(mx6q|mx6dl)" | 19 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)" |
20 | 20 | ||
21 | EXTRA_OECONF = "--libdir=${libdir}" | 21 | EXTRA_OECONF = "--libdir=${libdir}" |
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx/daemon.conf b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf index 9eb954bb..9eb954bb 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx/daemon.conf +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/daemon.conf | |||
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx/default.pa b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa index 83a6ba8d..83a6ba8d 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx/default.pa +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/default.pa | |||
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch index 57c28741..57c28741 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx-nxp-bsp/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch | |||
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index ae69be4c..c7a4292e 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | |||
@@ -1,13 +1,13 @@ | |||
1 | 1 | ||
2 | CACHED_CONFIGUREVARS:append:mx6 = " ax_cv_PTHREAD_PRIO_INHERIT=no" | 2 | CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no" |
3 | 3 | ||
4 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/imx:" | 4 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/imx-nxp-bsp:" |
5 | 5 | ||
6 | SRC_URI:append:mx6 = " file://daemon.conf file://default.pa" | 6 | SRC_URI:append:mx6-nxp-bsp = " file://daemon.conf file://default.pa" |
7 | SRC_URI:append:mx7 = " file://daemon.conf file://default.pa \ | 7 | SRC_URI:append:mx7-nxp-bsp = " file://daemon.conf file://default.pa \ |
8 | file://pulseaudio-remove-the-control-for-speaker-headphone-widge.patch \ | 8 | file://pulseaudio-remove-the-control-for-speaker-headphone-widge.patch \ |
9 | " | 9 | " |
10 | SRC_URI:append:mx8 = " file://daemon.conf file://default.pa" | 10 | SRC_URI:append:mx8-nxp-bsp = " file://daemon.conf file://default.pa" |
11 | 11 | ||
12 | do_install:append() { | 12 | do_install:append() { |
13 | if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then | 13 | if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then |
@@ -16,6 +16,6 @@ do_install:append() { | |||
16 | fi | 16 | fi |
17 | } | 17 | } |
18 | 18 | ||
19 | PACKAGE_ARCH:mx6 = "${MACHINE_SOCARCH}" | 19 | PACKAGE_ARCH:mx6-nxp-bsp = "${MACHINE_SOCARCH}" |
20 | PACKAGE_ARCH:mx7 = "${MACHINE_SOCARCH}" | 20 | PACKAGE_ARCH:mx7-nxp-bsp = "${MACHINE_SOCARCH}" |
21 | PACKAGE_ARCH:mx8 = "${MACHINE_SOCARCH}" | 21 | PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_SOCARCH}" |
diff --git a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb index 51c75bd1..2ad55a64 100644 --- a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb | |||
@@ -49,4 +49,4 @@ INSANE_SKIP:${PN} = "ldflags dev-elf" | |||
49 | INSANE_SKIP:${PN}-dev = "ldflags dev-elf" | 49 | INSANE_SKIP:${PN}-dev = "ldflags dev-elf" |
50 | INSANE_SKIP:tee-supplicant = "ldflags" | 50 | INSANE_SKIP:tee-supplicant = "ldflags" |
51 | 51 | ||
52 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 52 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb index 9b91f25e..003aeba2 100644 --- a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb | |||
@@ -25,18 +25,18 @@ PLATFORM_FLAVOR = "${@d.getVar('MACHINE')[1:]}" | |||
25 | PLATFORM_FLAVOR:imx6qdlsabresd = "mx6qsabresd" | 25 | PLATFORM_FLAVOR:imx6qdlsabresd = "mx6qsabresd" |
26 | PLATFORM_FLAVOR:imx6qdlsabreauto = "mx6qsabreauto" | 26 | PLATFORM_FLAVOR:imx6qdlsabreauto = "mx6qsabreauto" |
27 | PLATFORM_FLAVOR:imx6qpdlsolox = "mx6qsabresd" | 27 | PLATFORM_FLAVOR:imx6qpdlsolox = "mx6qsabresd" |
28 | PLATFORM_FLAVOR:imx6ul7d = "mx6ulevk" | 28 | PLATFORM_FLAVOR:imx6ul = "mx6ulevk" |
29 | PLATFORM_FLAVOR:imx6ull14x14evk = "mx6ullevk" | 29 | PLATFORM_FLAVOR:imx6ull = "mx6ullevk" |
30 | PLATFORM_FLAVOR:imx6ull9x9evk = "mx6ullevk" | 30 | PLATFORM_FLAVOR:imx6ull = "mx6ullevk" |
31 | PLATFORM_FLAVOR:imx6ulz-14x14-evk = "mx6ulzevk" | 31 | PLATFORM_FLAVOR:imx6ulz = "mx6ulzevk" |
32 | PLATFORM_FLAVOR:mx8mq = "mx8mqevk" | 32 | PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk" |
33 | PLATFORM_FLAVOR:mx8mm = "mx8mmevk" | 33 | PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk" |
34 | PLATFORM_FLAVOR:mx8mn = "mx8mnevk" | 34 | PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk" |
35 | PLATFORM_FLAVOR:mx8mp = "mx8mpevk" | 35 | PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk" |
36 | PLATFORM_FLAVOR:mx8qm = "mx8qmmek" | 36 | PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek" |
37 | PLATFORM_FLAVOR:mx8qxp = "mx8qxpmek" | 37 | PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek" |
38 | PLATFORM_FLAVOR:mx8dx = "mx8dxmek" | 38 | PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" |
39 | PLATFORM_FLAVOR:mx8dxl = "mx8dxlevk" | 39 | PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" |
40 | 40 | ||
41 | OPTEE_ARCH ?= "arm32" | 41 | OPTEE_ARCH ?= "arm32" |
42 | OPTEE_ARCH:armv7a = "arm32" | 42 | OPTEE_ARCH:armv7a = "arm32" |
@@ -93,4 +93,4 @@ FILES:${PN}-staticdev = "/usr/include/optee/" | |||
93 | RDEPENDS:${PN}-dev += "${PN}-staticdev" | 93 | RDEPENDS:${PN}-dev += "${PN}-staticdev" |
94 | 94 | ||
95 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 95 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
96 | COMPATIBLE_MACHINE = "(imx|imx-boot-container)" | 96 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb index 26339d61..7039d0c4 100644 --- a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb | |||
@@ -60,4 +60,4 @@ do_install () { | |||
60 | 60 | ||
61 | FILES:${PN} = "/usr/bin/ /lib*/optee_armtz/" | 61 | FILES:${PN} = "/usr/bin/ /lib*/optee_armtz/" |
62 | 62 | ||
63 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 63 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb index f8824a18..e92d26cb 100644 --- a/recipes-support/opencv/opencv_4.5.2.imx.bb +++ b/recipes-support/opencv/opencv_4.5.2.imx.bb | |||
@@ -271,12 +271,12 @@ SRC_URI += " \ | |||
271 | " | 271 | " |
272 | 272 | ||
273 | PACKAGECONFIG:remove = "eigen" | 273 | PACKAGECONFIG:remove = "eigen" |
274 | PACKAGECONFIG:append:mx8 = " dnn text" | 274 | PACKAGECONFIG:append:mx8-nxp-bsp = " dnn text" |
275 | PACKAGECONFIG_OPENCL = "" | 275 | PACKAGECONFIG_OPENCL = "" |
276 | PACKAGECONFIG_OPENCL:mx8 = "opencl" | 276 | PACKAGECONFIG_OPENCL:mx8-nxp-bsp = "opencl" |
277 | PACKAGECONFIG_OPENCL:mx8dxl = "" | 277 | PACKAGECONFIG_OPENCL:mx8dxl-nxp-bsp = "" |
278 | PACKAGECONFIG_OPENCL:mx8mm = "" | 278 | PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = "" |
279 | PACKAGECONFIG_OPENCL:mx8mnlite = "" | 279 | PACKAGECONFIG_OPENCL:mx8mnlite-nxp-bsp = "" |
280 | PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" | 280 | PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" |
281 | 281 | ||
282 | PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," | 282 | PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," |
@@ -296,6 +296,6 @@ do_install:append() { | |||
296 | 296 | ||
297 | FILES:${PN}-samples += "${datadir}/OpenCV/samples" | 297 | FILES:${PN}-samples += "${datadir}/OpenCV/samples" |
298 | 298 | ||
299 | COMPATIBLE_MACHINE = "(mx8)" | 299 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
300 | 300 | ||
301 | ########## End of i.MX overrides ########## | 301 | ########## End of i.MX overrides ########## |