MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2025-07-19 12:59:04 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Generalize overrides subsystem for NXP and Mainline support

Browse Source 
Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and
mainline-bsp.

So, for example, the mx8mq override is split into:

- imx-generic-bsp: compatible with every i.MX SoC and both BSP variants
- imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP
- imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP

- mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants
- mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP
- mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP

- mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants
- mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP
- mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP

- mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants
- mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP
- mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP

The extender mechanism is responsible for extending the override list to
include the generic overrides. We can then use the three different
variants to handle the metadata correctly.

Generically speaking, the conversion mainly was automated (with a lot of
back and forth until getting it right).

To convert an existing layer, the following script can be used:

```sh
  git ls-files classes recipes-* \
      | xargs sed -i \
              -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \
              -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \
              -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \
              -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \
              \
              -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \
              -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \
              -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \
              \
              -e 's,:\(vf\w*\),:\1-generic-bsp,g' \
              -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \
              -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \
              -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \
              \
              -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \
              -e 's,(\(imx\)),(\1-nxp-bsp),g' \
              -e 's,\(imx\)|,\1-nxp-bsp|,g' \
              -e 's,|\(imx\)),|\1-nxp-bsp),g'

  for d in $(find -type d | egrep '/mx[6-8]w*'); do
      git mv $d $d-nxp-bsp
  done

  for d in $(find -type d | egrep '/imx$'); do
      git mv $d $d-nxp-bsp
  done

  for d in $(find -type d | egrep '/mx[5s]w*'); do
      git mv $d $d-generic-bsp
  done
```

Fixes: #791.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2022-02-18 19:43:56 -03:00
parent a3b102a9ed
commit 30f5ce1d21
110 changed files with 400 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/image_types_fsl.bbclass
View File

@ -37,7 +37,7 @@ do_image_wic[depends] += " \
"
# We need to apply a fixup inside of the partition table
IMAGE_CMD:wic:append:mxs() {
IMAGE_CMD:wic:append:mxs-generic-bsp() {
# Change partition type for mxs processor family
bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc

2
classes/mfgtool-initramfs-image.bbclass
View File

@ -13,7 +13,7 @@ FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs"
FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs"
IMAGE_FSTYPES = "cpio.gz.u-boot"
IMAGE_FSTYPES:mxs = "cpio.gz.u-boot"
IMAGE_FSTYPES:mxs-generic-bsp = "cpio.gz.u-boot"
IMAGE_ROOTFS_SIZE ?= "8192"
# Filesystems enabled by default

4
classes/use-imx-headers.bbclass
View File

@ -13,14 +13,14 @@
#
# Copyright 2018 (C) O.S. Systems Software LTDA.
DEPENDS:append:imx = " linux-imx-headers"
DEPENDS:append:imx-nxp-bsp = " linux-imx-headers"
# Set runtime dependency of -dev for package inheriting this class to
# linux-imx-headers-dev package. This is required in order to propagate
# headers into the SDK
RDEPENDS:${PN}-dev += "linux-imx-headers-dev"
PACKAGE_ARCH:imx ?= "${MACHINE_SOCARCH}"
PACKAGE_ARCH:imx-nxp-bsp ?= "${MACHINE_SOCARCH}"
STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx"

8
classes/use-imx-security-controller-firmware.bbclass
View File

@ -18,14 +18,14 @@
SECO_FIRMWARE_NAME ?= ""
SECO_FIRMWARE_NAME:mx8qm = "mx8qmb0-ahab-container.img"
SECO_FIRMWARE_NAME:mx8qxp = \
SECO_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qmb0-ahab-container.img"
SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp = \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
'mx8qxc0-ahab-container.img', d)}"
SECO_FIRMWARE_NAME:mx8dxl = "mx8dxla1-ahab-container.img"
SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxla1-ahab-container.img"
python () {
if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"):
if "mx8m-nxp-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
return # We need to allow the recipes to be parsed for this case
seco_firmware = d.getVar('SECO_FIRMWARE_NAME')

332
conf/machine/include/imx-base.inc
View File

@ -75,20 +75,20 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
UBOOT_ENTRYPOINT:mxs = "0x40008000"
UBOOT_ENTRYPOINT:mx51 = "0x90008000"
UBOOT_ENTRYPOINT:mx53 = "0x70008000"
UBOOT_ENTRYPOINT:mx6 = "0x10008000"
UBOOT_ENTRYPOINT:mx6sl = "0x80008000"
UBOOT_ENTRYPOINT:mx6sll = "0x80008000"
UBOOT_ENTRYPOINT:mx6sx = "0x80008000"
UBOOT_ENTRYPOINT:mx6ul = "0x80008000"
UBOOT_ENTRYPOINT:mx6ull = "0x80008000"
UBOOT_ENTRYPOINT:mx6ulz = "0x80008000"
UBOOT_ENTRYPOINT:mx7 = "0x80008000"
UBOOT_ENTRYPOINT:mx7ulp = "0x60008000"
UBOOT_ENTRYPOINT:mx8m = "0x40480000"
UBOOT_ENTRYPOINT:vf = "0x80008000"
UBOOT_ENTRYPOINT:mxs-generic-bsp = "0x40008000"
UBOOT_ENTRYPOINT:mx51-generic-bsp = "0x90008000"
UBOOT_ENTRYPOINT:mx53-generic-bsp = "0x70008000"
UBOOT_ENTRYPOINT:mx6-generic-bsp = "0x10008000"
UBOOT_ENTRYPOINT:mx6sl-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx6sll-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx6sx-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx6ul-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx6ull-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx6ulz-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx7-generic-bsp = "0x80008000"
UBOOT_ENTRYPOINT:mx7ulp-generic-bsp = "0x60008000"
UBOOT_ENTRYPOINT:mx8m-generic-bsp = "0x40480000"
UBOOT_ENTRYPOINT:vf-generic-bsp = "0x80008000"
# Some derivates can utilize the boot container provided by U-Boot,
# below variable sets that those machines which have a imx-boot-container
@ -96,11 +96,11 @@ UBOOT_ENTRYPOINT:vf = "0x80008000"
UBOOT_PROVIDES_BOOT_CONTAINER = "0"
UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER_DRIVER = "xf86-video-fbdev"
XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante"
XSERVER_DRIVER:vf = "xf86-video-modesetting"
XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER_DRIVER = "xf86-video-fbdev"
XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante"
XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting"
XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting"
XSERVER_DRIVER:use-mainline-bsp = " \
xf86-video-fbdev \
xf86-video-modesetting \
@ -118,42 +118,87 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
# ARM_INSTRUCTION_SET = "thumb"
#
# handled by software
# DEFAULTTUNE:mx6 ?= "cortexa9t-neon"
# DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9t-neon"
# handled by hardware
DEFAULTTUNE:mx6 ?= "cortexa9thf-neon"
DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon"
DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon"
DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon"
DEFAULTTUNE:mx7 ?= "cortexa7thf-neon"
DEFAULTTUNE:vf ?= "cortexa5thf-neon"
DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9thf-neon"
DEFAULTTUNE:mx6ul-generic-bsp ?= "cortexa7thf-neon"
DEFAULTTUNE:mx6ull-generic-bsp ?= "cortexa7thf-neon"
DEFAULTTUNE:mx6ulz-generic-bsp ?= "cortexa7thf-neon"
DEFAULTTUNE:mx7-generic-bsp ?= "cortexa7thf-neon"
DEFAULTTUNE:vf-generic-bsp ?= "cortexa5thf-neon"
DEFAULTTUNE:mx8m ?= "cortexa53-crypto"
DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto"
DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto"
DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto"
DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto"
DEFAULTTUNE:mx8qxp-generic-bsp ?= "cortexa35-crypto"
INHERIT += "machine-overrides-extender"
MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp"
MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev"
#######
### NXP BSP specific overrides
#######
MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \
imx \
\
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
#######
### Mainline BSP specific overrides
#######
MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx28:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx28-generic-bsp:mx28-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx51:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx51-generic-bsp:mx51-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx53:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx53-generic-bsp:mx53-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx6q:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6q-generic-bsp:mx6q-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx6dl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6dl-generic-bsp:mx6dl-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx6sx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sx-generic-bsp:mx6sx-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx6sl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sl-generic-bsp:mx6sl-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx6sll:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sll-generic-bsp:mx6sll-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx6ul:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp"
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"
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"
MACHINEOVERRIDES_EXTENDER:mx7d:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7d-generic-bsp:mx7d-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx7ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7ulp-generic-bsp:mx7ulp-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx8qm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qm-generic-bsp:mx8qm-mainline-bsp"
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"
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"
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"
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"
MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp"
MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8dxl-generic-bsp:mx8dxl-mainline-bsp"
MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
mx6 \
mx6q \
mx6dl \
@ -181,29 +226,29 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \
# Sub-architecture support
MACHINE_SOCARCH_SUFFIX ?= ""
MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl"
MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl"
MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx"
MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl"
MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll"
MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d"
MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp"
MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60"
MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50"
MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul"
MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul"
MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul"
MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8"
MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm"
MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn"
MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp"
MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m"
MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8"
MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl"
MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl"
MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl"
MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx"
MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl"
MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll"
MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d"
MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp"
MACHINE_SOCARCH_SUFFIX:vf60-nxp-bsp = "-vf60"
MACHINE_SOCARCH_SUFFIX:vf50-nxp-bsp = "-vf50"
MACHINE_SOCARCH_SUFFIX:mx6ul-nxp-bsp = "-mx6ul"
MACHINE_SOCARCH_SUFFIX:mx6ull-nxp-bsp = "-mx6ul"
MACHINE_SOCARCH_SUFFIX:mx6ulz-nxp-bsp = "-mx6ul"
MACHINE_SOCARCH_SUFFIX:mx8qm-nxp-bsp = "-mx8"
MACHINE_SOCARCH_SUFFIX:mx8mm-nxp-bsp = "-mx8mm"
MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp = "-mx8mn"
MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp"
MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m"
MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8"
MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl"
MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx"
MACHINE_ARCH_FILTER = "virtual/kernel"
MACHINE_SOCARCH_FILTER:append:imx = " \
MACHINE_SOCARCH_FILTER:append:use-nxp-bsp = " \
alsa-lib \
gstreamer1.0 \
weston \
@ -244,17 +289,17 @@ MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \
pango \
qtbase \
"
MACHINE_SOCARCH_FILTER:append:mx6q = " \
MACHINE_SOCARCH_FILTER:append:mx6q-nxp-bsp = " \
opencl-icd-loader \
opencl-clhpp \
opencl-headers \
"
MACHINE_SOCARCH_FILTER:append:mx8 = " \
MACHINE_SOCARCH_FILTER:append:mx8-nxp-bsp = " \
opencl-icd-loader \
opencl-clhpp \
opencl-headers \
"
MACHINE_SOCARCH_FILTER:append:mx8qm = " \
MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \
virtual/libopenvx \
"
@ -270,32 +315,32 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \
# Firmware
MACHINE_FIRMWARE ?= ""
MACHINE_FIRMWARE:append:mx27 = " firmware-imx-vpu-imx27"
MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q"
MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q"
MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx"
MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8"
MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8"
MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27"
MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6-generic-bsp = " linux-firmware-imx-sdma-imx6q"
MACHINE_FIRMWARE:append:mx6q-generic-bsp = " firmware-imx-vpu-imx6q"
MACHINE_FIRMWARE:append:mx6dl-generic-bsp = " firmware-imx-vpu-imx6d firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6sl-generic-bsp = " firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc"
MACHINE_FIRMWARE:append:mx53-generic-bsp = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
MACHINE_FIRMWARE:append:mx51-generic-bsp = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx"
MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " firmware-imx-vpu-imx8"
MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-vpu-imx8"
MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
# Extra audio support
IMX_ALSA_EXTRA = ""
IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins"
MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
MACHINE_EXTRA_RRECOMMENDS:append:mx7-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
# Extra Cypress Wi-Fi and BTW firmware (Murata)
MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}"
@ -320,28 +365,28 @@ MACHINE_EXTRA_RRECOMMENDS += " \
"
# GStreamer 1.0 plugins
MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6q-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx7d-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm-nxp-bsp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn-nxp-bsp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp-nxp-bsp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq-nxp-bsp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin"
MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin"
PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8 ?= "1.18.0"
PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.18.0"
PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8 ?= "1.18.0"
PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ?= "1.18.0.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ?= "1.18.0"
PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ?= "1.18.0"
PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ?= "1.18.0"
# Determines if the SoC has support for Vivante kernel driver
SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0"
@ -368,43 +413,43 @@ PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv"
PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv"
PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv"
PREFERRED_VERSION_weston:imx ?= "9.0.0.imx"
PREFERRED_VERSION_weston:use-nxp-bsp ?= "9.0.0.imx"
PREFERRED_VERSION_weston:use-mainline-bsp = ""
PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.22.imx"
PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.22.imx"
PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.22.imx"
PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx"
PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx"
PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx"
# Use i.MX libdrm Version
PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx"
PREFERRED_VERSION_libdrm:mx7 ?= "2.4.107.imx"
PREFERRED_VERSION_libdrm:mx8 ?= "2.4.107.imx"
PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.107.imx"
PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx"
PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx"
# Use i.MX optee Version
PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx"
PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx"
PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx"
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ?= "3.10.0.imx"
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx"
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ?= "3.10.0.imx"
#Use i.MX opencv Version for mx8
PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx"
PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx"
# Handle default kernel
IMX_DEFAULT_KERNEL = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mxs = "linux-fslc"
IMX_DEFAULT_KERNEL:mx5 = "linux-fslc"
IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx"
IMX_DEFAULT_KERNEL = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mxs-generic-bsp = "linux-fslc"
IMX_DEFAULT_KERNEL:mx5-generic-bsp = "linux-fslc"
IMX_DEFAULT_KERNEL:mx6-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx7-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx8-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx7ulp-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx6sll-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx6ul-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:mx6ull-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc"
PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz"
SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz"
SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "uboot-mxsboot-sdcard wic.bmap wic.gz"
# Do not update fstab file when using wic images
WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
@ -433,8 +478,8 @@ WKS_FILE_DEPENDS ?= " \
${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \
"
WKS_FILE_DEPENDS:append:mx8 = " imx-boot"
WKS_FILE_DEPENDS:append:mx8m = " imx-boot"
WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot"
WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot"
# We need to restrict the append so we don't add this for other i.MX SoC's.
# Derivatives that are not yet adopted the usage of boot container provided
@ -453,10 +498,10 @@ WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \
"
SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in"
SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in"
SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in"
SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in"
SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in"
SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in"
# Boot container built as a part of mainline U-Boot uses different WKS
# file as the entire mx8m series, as U-Boot versions later than 2021.04 are
@ -471,14 +516,11 @@ SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in"
WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
SERIAL_CONSOLES = "115200;ttymxc0"
SERIAL_CONSOLES:mxs = "115200;ttyAMA0"
SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0"
KERNEL_IMAGETYPE = "zImage"
KERNEL_IMAGETYPE:aarch64 = "Image"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
# Add the ability to specify imx machines
MACHINEOVERRIDES =. "imx:"
HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum"
HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum"

0
dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch → dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch
View File

0
dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf → dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf
View File

0
dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf → dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf
View File

14
recipes-bsp/alsa-state/alsa-state.bbappend
View File

@ -1,10 +1,10 @@
# Append path for freescale layer to include alsa-state asound.conf
FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/imx:"
FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/imx:"
FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/imx:"
FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx:"
FILESEXTRAPATHS:prepend:mx6-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
FILESEXTRAPATHS:prepend:mx7-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
FILESEXTRAPATHS:prepend:mx8-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
PACKAGE_ARCH:mx6 = "${MACHINE_ARCH}"
PACKAGE_ARCH:mx7 = "${MACHINE_ARCH}"
PACKAGE_ARCH:mx8 = "${MACHINE_ARCH}"
PACKAGE_ARCH:mx6-nxp-bsp = "${MACHINE_ARCH}"
PACKAGE_ARCH:mx7-nxp-bsp = "${MACHINE_ARCH}"
PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_ARCH}"
PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}"

0
recipes-bsp/alsa-state/alsa-state/imx/asound.conf → recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
View File

0
recipes-bsp/alsa-state/alsa-state/imx/asound.state → recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.state
View File

6
recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb
View File

@ -18,6 +18,6 @@ addtask deploy after do_install before do_build
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx8)"
COMPATIBLE_MACHINE:mx8m = "(^$)"
COMPATIBLE_MACHINE:mx8x = "(^$)"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)"
COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)"

2
recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb
View File

@ -21,4 +21,4 @@ addtask deploy after do_install before do_build
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx8m|imx-boot-container)"
COMPATIBLE_MACHINE = "(mx8m-nxp-bsp|imx-boot-container)"

2
recipes-bsp/firmware-imx/firmware-imx_8.14.bb
View File

@ -129,4 +129,4 @@ FILES:${PN}-hdmi = " \
${nonarch_base_libdir}/firmware/dpfw.bin \
"
COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

0
recipes-bsp/formfactor/formfactor/mx6/machconfig → recipes-bsp/formfactor/formfactor/mx6-nxp-bsp/machconfig
View File

0
recipes-bsp/formfactor/formfactor/mx6sll/machconfig → recipes-bsp/formfactor/formfactor/mx6sll-nxp-bsp/machconfig
View File

0
recipes-bsp/formfactor/formfactor/mx6ul/machconfig → recipes-bsp/formfactor/formfactor/mx6ul-nxp-bsp/machconfig
View File

0
recipes-bsp/formfactor/formfactor/mx7/machconfig → recipes-bsp/formfactor/formfactor/mx7-nxp-bsp/machconfig
View File

0
recipes-bsp/formfactor/formfactor/mx7ulp/machconfig → recipes-bsp/formfactor/formfactor/mx7ulp-nxp-bsp/machconfig
View File

2
recipes-bsp/imx-atf/imx-atf_2.4.bb
View File

@ -67,4 +67,4 @@ do_deploy() {
addtask deploy after do_compile
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx8|imx-boot-container)"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp|imx-boot-container)"

2
recipes-bsp/imx-kobs/imx-kobs_git.bb
View File

@ -15,4 +15,4 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig
COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

22
recipes-bsp/imx-lib/imx-lib_git.bb
View File

@ -21,16 +21,16 @@ S = "${WORKDIR}/git"
inherit use-imx-headers
PLATFORM:mx6q = "IMX6Q"
PLATFORM:mx6dl = "IMX6Q"
PLATFORM:mx6sl = "IMX6S"
PLATFORM:mx6sll = "IMX6UL"
PLATFORM:mx6sx = "IMX6S"
PLATFORM:mx6ul = "IMX6UL"
PLATFORM:mx6ull = "IMX6UL"
PLATFORM:mx7d = "IMX7"
PLATFORM:mx7ulp = "IMX7"
PLATFORM:mx8ulp = "IMX8ULP"
PLATFORM:mx6q-nxp-bsp = "IMX6Q"
PLATFORM:mx6dl-nxp-bsp = "IMX6Q"
PLATFORM:mx6sl-nxp-bsp = "IMX6S"
PLATFORM:mx6sll-nxp-bsp = "IMX6UL"
PLATFORM:mx6sx-nxp-bsp = "IMX6S"
PLATFORM:mx6ul-nxp-bsp = "IMX6UL"
PLATFORM:mx6ull-nxp-bsp = "IMX6UL"
PLATFORM:mx7d-nxp-bsp = "IMX7"
PLATFORM:mx7ulp-nxp-bsp = "IMX7"
PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
PARALLEL_MAKE="-j 1"
EXTRA_OEMAKE = ""
@ -47,4 +47,4 @@ do_install () {
find ${D}/ -name *.go -exec rm {} \;
}
COMPATIBLE_MACHINE = "(mx6|mx7|mx8ulp)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp)"

20
recipes-bsp/imx-mkimage/imx-boot_1.0.bb
View File

@ -10,8 +10,8 @@ SECTION = "BSP"
inherit use-imx-security-controller-firmware
IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco"
IMX_EXTRA_FIRMWARE:mx8m = "firmware-imx-8m"
IMX_EXTRA_FIRMWARE:mx8x = "imx-sc-firmware imx-seco"
IMX_EXTRA_FIRMWARE:mx8m-nxp-bsp = "firmware-imx-8m"
IMX_EXTRA_FIRMWARE:mx8x-nxp-bsp = "imx-sc-firmware imx-seco"
DEPENDS += " \
u-boot \
${IMX_EXTRA_FIRMWARE} \
@ -20,7 +20,7 @@ DEPENDS += " \
"
# xxd is a dependency of fspi_packer.sh
DEPENDS += "xxd-native"
DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native"
DEPENDS:append:mx8m-nxp-bsp = " u-boot-mkimage-native dtc-native"
BOOT_NAME = "imx-boot"
PROVIDES = "${BOOT_NAME}"
@ -61,16 +61,16 @@ IMXBOOT_TARGETS ?= \
'flash_multi_cores flash_dcd', d), d)}"
BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}"
BOOT_STAGING:mx8m = "${S}/iMX8M"
BOOT_STAGING:mx8dx = "${S}/iMX8QX"
BOOT_STAGING:mx8m-nxp-bsp = "${S}/iMX8M"
BOOT_STAGING:mx8dx-nxp-bsp = "${S}/iMX8QX"
SOC_FAMILY = "INVALID"
SOC_FAMILY:mx8 = "mx8"
SOC_FAMILY:mx8m = "mx8m"
SOC_FAMILY:mx8x = "mx8x"
SOC_FAMILY:mx8-nxp-bsp = "mx8"
SOC_FAMILY:mx8m-nxp-bsp = "mx8m"
SOC_FAMILY:mx8x-nxp-bsp = "mx8x"
REV_OPTION ?= ""
REV_OPTION:mx8qxp = \
REV_OPTION:mx8qxp-nxp-bsp = \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \
'REV=C0', d)}"
@ -201,4 +201,4 @@ addtask deploy before do_build after do_compile
PACKAGE_ARCH = "${MACHINE_ARCH}"
FILES:${PN} = "/boot"
COMPATIBLE_MACHINE = "(mx8)"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"

10
recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb
View File

@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "4ad2999088098c7d95837b7dc88adceda319c2102c8bdf55bf6e945365
BOARD_TYPE ?= "mek"
SC_FIRMWARE_NAME ?= "INVALID"
SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
symlink_name = "scfw_tcm.bin"
@ -38,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"

2
recipes-bsp/imx-seco/imx-seco-libs_git.bb
View File

@ -21,4 +21,4 @@ do_install () {
oe_runmake DESTDIR=${D} install
}
COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"

2
recipes-bsp/imx-seco/imx-seco_3.8.4.bb
View File

@ -23,4 +23,4 @@ do_deploy () {
install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
}
COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"

2
recipes-bsp/imx-test/imx-test_00.00.00.bb
View File

@ -7,4 +7,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
ALLOW_EMPTY:${PN} = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)"
COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf50-generic-bsp|vf60-generic-bsp)"

24
recipes-bsp/imx-test/imx-test_git.bb
View File

@ -9,8 +9,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
DEPENDS = "alsa-lib libdrm"
DEPENDS:append:mx6 = " imx-lib"
DEPENDS:append:mx7 = " imx-lib"
DEPENDS:append:mx6-nxp-bsp = " imx-lib"
DEPENDS:append:mx7-nxp-bsp = " imx-lib"
DEPENDS:append:imxvpu = " virtual/imxvpu"
PE = "1"
@ -29,22 +29,22 @@ inherit module-base use-imx-headers
INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
PLATFORM:mx6q = "IMX6Q"
PLATFORM:mx6dl = "IMX6Q"
PLATFORM:mx6sl = "IMX6SL"
PLATFORM:mx6sll = "IMX6SL"
PLATFORM:mx6sx = "IMX6SX"
PLATFORM:mx6ul = "IMX6UL"
PLATFORM:mx7d = "IMX7D"
PLATFORM:mx7ulp = "IMX7D"
PLATFORM:mx8 = "IMX8"
PLATFORM:mx6q-nxp-bsp = "IMX6Q"
PLATFORM:mx6dl-nxp-bsp = "IMX6Q"
PLATFORM:mx6sl-nxp-bsp = "IMX6SL"
PLATFORM:mx6sll-nxp-bsp = "IMX6SL"
PLATFORM:mx6sx-nxp-bsp = "IMX6SX"
PLATFORM:mx6ul-nxp-bsp = "IMX6UL"
PLATFORM:mx7d-nxp-bsp = "IMX7D"
PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
PLATFORM:mx8-nxp-bsp = "IMX8"
PARALLEL_MAKE = "-j 1"
EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG:append:imxvpu = " vpu"
PACKAGECONFIG:append:mx8m = " swpdm"
PACKAGECONFIG:append:mx8m-nxp-bsp = " swpdm"
PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu"

2
recipes-bsp/imx-uuc/imx-uuc_git.bb
View File

@ -18,4 +18,4 @@ S = "${WORKDIR}/git"
FILES:${PN} += "/linuxrc /fat"
COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

2
recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb
View File

@ -32,4 +32,4 @@ do_install () {
FILES:${PN} = "/"
COMPATIBLE_MACHINE = "(mx8mp)"
COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

10
recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb
View File

@ -4,7 +4,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
DEPENDS = "imx-vpu-hantro"
DEPENDS:append:mx8mp = " imx-vpu-hantro-vc"
DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
SRC_URI = " \
${FSL_MIRROR}/${BP}.tar.gz \
@ -12,9 +12,9 @@ SRC_URI = " \
SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b"
SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8"
PLATFORM:mx8mm = "IMX8MM"
PLATFORM:mx8mq = "IMX8MQ"
PLATFORM:mx8mp = "IMX8MP"
PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
EXTRA_OEMAKE = " \
CROSS_COMPILE="${HOST_PREFIX}" \
@ -28,4 +28,4 @@ do_install () {
}
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"

8
recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb
View File

@ -14,9 +14,9 @@ inherit fsl-eula-unpack use-imx-headers
PARALLEL_MAKE="-j 1"
PLATFORM:mx8mm = "IMX8MM"
PLATFORM:mx8mq = "IMX8MQ"
PLATFORM:mx8mp = "IMX8MP"
PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
EXTRA_OEMAKE = " \
CROSS_COMPILE="${HOST_PREFIX}" \
@ -32,4 +32,4 @@ FILES:${PN} += "/unit_tests"
RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"

2
recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
View File

@ -29,4 +29,4 @@ do_install() {
}
# Compatible only for i.MX with Chips&Media VPU
COMPATIBLE_MACHINE = "(mx6q|mx6dl)"
COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)"

2
recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb
View File

@ -24,4 +24,4 @@ SYSTEMD_AUTO_ENABLE = "enable"
FILES:${PN} = "${libdir} /opt"
INSANE_SKIP:${PN} = "file-rdeps already-stripped"
COMPATIBLE_MACHINE = "(mx8mp)"
COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

2
recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb
View File

@ -88,4 +88,4 @@ INSANE_SKIP:${PN} = "rpaths"
RDEPENDS:${PN} = "libdrm libpython3"
COMPATIBLE_MACHINE = "(mx8mp)"
COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

8
recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb
View File

@ -32,9 +32,9 @@ PACKAGECONFIG ?= " "
PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}"
PACKAGECONFIG:append:imxipu = " ipu"
PACKAGECONFIG:append:imxpxp = " pxp"
PACKAGECONFIG:append:mx8m = " ion dwl"
PACKAGECONFIG:append:mx8qm = " ion"
PACKAGECONFIG:append:mx8qxp = " ion"
PACKAGECONFIG:append:mx8m-nxp-bsp = " ion dwl"
PACKAGECONFIG:append:mx8qm-nxp-bsp = " ion"
PACKAGECONFIG:append:mx8qxp-nxp-bsp = " ion"
HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
@ -51,4 +51,4 @@ do_install_ptest_base() {
install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH}
}
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
View File

@ -27,6 +27,6 @@ do_install () {
ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
}
COMPATIBLE_MACHINE:class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|mx7-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"
BBCLASSEXTEND = "native nativesdk"

4
recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
View File

@ -12,7 +12,7 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native lzop-native"
# Location known to imx-boot component, where U-Boot artifacts
# should be additionally deployed.
# See below note above do_deploy:append:mx8m for the purpose of
# See below note above do_deploy:append:mx8m-nxp-bsp for the purpose of
# this delopyment location
BOOT_TOOLS = "imx-boot-tools"
@ -28,4 +28,4 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
HOSTSTRIP=true'
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|mx7-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"

4
recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
View File

@ -8,5 +8,5 @@ require u-boot-imx_${PV}.bb
require u-boot-mfgtool.inc
UUU_BOOTLOADER_TAGGED = ""
UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"

12
recipes-bsp/u-boot/u-boot-imx_2021.04.bb
View File

@ -10,13 +10,13 @@ PROVIDES += "u-boot"
inherit uuu_bootloader_tag
UUU_BOOTLOADER = ""
UUU_BOOTLOADER:mx6 = "${UBOOT_BINARY}"
UUU_BOOTLOADER:mx7 = "${UBOOT_BINARY}"
UUU_BOOTLOADER:mx6-nxp-bsp = "${UBOOT_BINARY}"
UUU_BOOTLOADER:mx7-nxp-bsp = "${UBOOT_BINARY}"
UUU_BOOTLOADER_TAGGED = ""
UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-tagged.${UBOOT_SUFFIX}"
UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-tagged.${UBOOT_SUFFIX}"
UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
do_deploy:append:mx8m() {
do_deploy:append:mx8m-nxp-bsp() {
# Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
if [ -n "${UBOOT_CONFIG}" ]
then
@ -38,4 +38,4 @@ do_deploy:append:mx8m() {
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|use-mainline-bsp)"

2
recipes-devtools/uuu/uuu_git.bb
View File

@ -17,6 +17,6 @@ S = "${WORKDIR}/git"
DEPENDS = "libusb zlib bzip2 openssl"
COMPATIBLE_MACHINE = "(imx)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
BBCLASSEXTEND = "native nativesdk"

2
recipes-extended/dpdk/dpdk.inc
View File

@ -14,7 +14,7 @@ COMPATIBLE_HOST:armv4 = 'null'
COMPATIBLE_HOST:armv5 = 'null'
COMPATIBLE_HOST:armv6 = 'null'
COMPATIBLE_MACHINE = "(imx|qoriq)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp|qoriq)"
DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc"
DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc"

2
recipes-extended/jailhouse/jailhouse_0.12.bb
View File

@ -119,4 +119,4 @@ RDEPENDS:pyjailhouse = " \
INSANE_SKIP:${PN} = "ldflags"
COMPATIBLE_MACHINE = "(mx8m)"
COMPATIBLE_MACHINE = "(mx8m-nxp-bsp)"

2
recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
View File

@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
ISP_PKGS ?= ""
ISP_PKGS:mx8mp = " \
ISP_PKGS:mx8mp-nxp-bsp = " \
isp-imx \
basler-camera \
basler-camera-dev \

2
recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
View File

@ -46,4 +46,4 @@ RDEPENDS:${PN}-extfs = " \
e2fsprogs-mke2fs \
e2fsprogs-e2fsck \
"
COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

2
recipes-graphics/drm/libdrm_2.4.107.imx.bb
View File

@ -18,7 +18,7 @@ SRCREV = "a7316e7d67b7708f40ffe469858dae07f14fe21a"
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"
inherit meson pkgconfig manpages

2
recipes-graphics/images/core-image-weston.bbappend
View File

@ -1,3 +1,3 @@
# FIXME: i.MX6SL cannot use mesa for Graphics and it lacks GL support,
# so for now we skip it.
CORE_IMAGE_BASE_INSTALL:remove:mx6sl = "clutter-1.0-examples"
CORE_IMAGE_BASE_INSTALL:remove:mx6sl-nxp-bsp = "clutter-1.0-examples"

6
recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
View File

@ -13,13 +13,13 @@ S = "${WORKDIR}/git"
inherit cmake pkgconfig perlnative python3native
PACKAGECONFIG_BACKEND:mx6 = " \
PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
'', d), d)} \
"
PACKAGECONFIG_BACKEND:mx7 = "${PACKAGECONFIG_BACKEND:mx6}"
PACKAGECONFIG_BACKEND:mx8 = "waffle"
PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}"
PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle"
PACKAGECONFIG_GPU2D = ""
PACKAGECONFIG_GPU2D:imxgpu2d = "vivante"

43
recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
View File

@ -18,7 +18,7 @@ DEPENDS += " \
'', d)} \
"
DEPENDS:append:imxdrm = " libdrm wayland"
DEPENDS:append:mx8 = " patchelf-native"
DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
# imx-gpu-viv does not provide everything it needs to for virtual/libgl
# on x11 backend or on Wayland backend with XWayland support.
@ -31,12 +31,12 @@ EXTRA_PROVIDES:append:imxgpu3d = " \
virtual/libgles1 \
virtual/libgles2 \
"
EXTRA_PROVIDES:append:mx8 = " \
EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
virtual/libgbm \
"
PROVIDES_OPENVX = ""
PROVIDES_OPENVX:mx8 = "virtual/libopenvx"
PROVIDES_OPENVX:mx8mm = ""
PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx"
PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
PROVIDES += " \
imx-gpu-viv \
libgal-imx \
@ -56,12 +56,7 @@ PE = "1"
inherit fsl-eula-unpack features_check
# For i.MX 6 & 7, support Wayland and Framebuffer
CONFLICT_DISTRO_FEATURES:mx6 = \
"${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'x11', d)}"
CONFLICT_DISTRO_FEATURES:mx7 = "${CONFLICT_DISTRO_FEATURES:mx6}"
# For i.MX 8, support Wayland only
REQUIRED_DISTRO_FEATURES:mx8 = "wayland"
REQUIRED_DISTRO_FEATURES:mx8-nxp-bsp = "wayland"
SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
@ -72,7 +67,7 @@ PACKAGECONFIG[valgrind] = ""
# Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
IMX_PACKAGES_GBM = ""
IMX_PACKAGES_GBM:mx8 = "libgbm-imx libgbm-imx-dev"
IMX_PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
PACKAGES =+ "libclc-imx libclc-imx-dev \
libgl-imx libgl-imx-dev \
libgles1-imx libgles1-imx-dev \
@ -140,23 +135,23 @@ python __anonymous() {
}
IS_MX6SL = "0"
IS_MX6SL:mx6sl = "1"
IS_MX6SL:mx6sl-nxp-bsp = "1"
IS_MX8 = "0"
IS_MX8:mx8 = "1"
IS_MX8:mx8-nxp-bsp = "1"
PACKAGE_FP_TYPE = "hardfp"
HAS_GBM = "false"
HAS_GBM:mx8 = "true"
HAS_GBM:mx8-nxp-bsp = "true"
IMX_SOC = "IMX_SOC_NOT_SET"
IMX_SOC:mx8qm = "mx8qm"
IMX_SOC:mx8mp = "mx8mp"
IMX_SOC:mx8mq = "mx8mq"
IMX_SOC:mx8qxp = "mx8qxp"
IMX_SOC:mx8mn = "mx8mn"
IMX_SOC:mx8ulp = "mx8ulp"
IMX_SOC:mx8qm-nxp-bsp = "mx8qm"
IMX_SOC:mx8mp-nxp-bsp = "mx8mp"
IMX_SOC:mx8mq-nxp-bsp = "mx8mq"
IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp"
IMX_SOC:mx8mn-nxp-bsp = "mx8mn"
IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
LIBVULKAN_VERSION_MAJOR = "1"
LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.1.6"
@ -262,9 +257,9 @@ INSANE_SKIP:libgal-imx += "build-deps"
FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}"
FILES:libgbm-imx:mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}"
FILES:libgbm-imx-dev:mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
RDEPENDS:libgbm-imx:append:mx8 = " libdrm"
FILES:libgbm-imx:mx8-nxp-bsp = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}"
FILES:libgbm-imx-dev:mx8-nxp-bsp = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
RDEPENDS:libgbm-imx:append:mx8-nxp-bsp = " libdrm"
INSANE_SKIP:libgbm-imx += "dev-so"
FILES:libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}"
@ -328,4 +323,4 @@ INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps"
FILES:libnn-imx = "${libdir}/libNN*${SOLIBS}"
# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)"
# COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx8-nxp-bsp)"

2
recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb
View File

@ -7,4 +7,4 @@ require imx-gpu-viv-6.inc
SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40"
SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1"
COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"

2
recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb
View File

@ -3,4 +3,4 @@ require imx-gpu-viv-6.inc
SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb"
SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4"
COMPATIBLE_MACHINE = "(mx8)"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"

4
recipes-graphics/waffle/waffle_%.bbappend
View File

@ -8,8 +8,8 @@ SRC_URI += " \
PACKAGECONFIG_IMXGPU_X11 = ""
PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx"
PACKAGECONFIG_IMXGPU_GBM = "gbm"
PACKAGECONFIG_IMXGPU_GBM:mx6 = ""
PACKAGECONFIG_IMXGPU_GBM:mx7 = ""
PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp = ""
PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp = ""
PACKAGECONFIG:imxgpu = " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \

12
recipes-graphics/wayland/weston-init.bbappend
View File

@ -6,19 +6,19 @@ IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu2d = "opengl"
IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = ""
REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
SRC_URI:append:mx6sl = " file://weston.config"
SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config"
# To customize weston.ini, start by setting the desired assignment in weston.ini,
# commented out. For example:
# #xwayland=true
# Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS.
INI_UNCOMMENT_ASSIGNMENTS:append:imx = " \
INI_UNCOMMENT_ASSIGNMENTS:append:imx-nxp-bsp = " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \
"
INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \
INI_UNCOMMENT_ASSIGNMENTS:append:mx8-nxp-bsp = " \
repaint-window=16 \
"
INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \
INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \
gbm-format=argb8888 \
\\[shell\\] \
size=1920x1080 \
@ -28,8 +28,8 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \
# Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest
# rendering code.
INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1"
INI_UNCOMMENT_USE_G2D:mx8qm = ""
INI_UNCOMMENT_USE_G2D:mx8qxp = ""
INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp = ""
INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp = ""
INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \
${INI_UNCOMMENT_USE_G2D} \
"

0
recipes-graphics/wayland/weston-init/imx/weston.ini → recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
View File

0
recipes-graphics/wayland/weston-init/mx6sl/weston.config → recipes-graphics/wayland/weston-init/mx6sl-nxp-bsp/weston.config
View File

0
recipes-graphics/xinput-calibrator/pointercal-xinput/mx6/pointercal.xinput → recipes-graphics/xinput-calibrator/pointercal-xinput/mx6-nxp-bsp/pointercal.xinput
View File

2
recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb
View File

@ -62,4 +62,4 @@ FILES:${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIB
FILES:xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi"
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx6|mx7ulp)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7ulp-nxp-bsp)"

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx5-generic-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sl-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sll-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx6sx-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ul-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx6ull-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx7/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx7-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mx7ulp-nxp-bsp/xorg.conf
View File

0
recipes-graphics/xorg-xserver/xserver-xf86-config/mxs/xorg.conf → recipes-graphics/xorg-xserver/xserver-xf86-config/mxs-generic-bsp/xorg.conf
View File

4
recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
View File

@ -19,6 +19,6 @@ SRC_URI:append:imxgpu = " \
IMX_OPENGL_PKGCONFIGS_REMOVE = ""
IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx"

4
recipes-graphics/xwayland/xwayland_%.bbappend
View File

@ -1,4 +1,4 @@
IMX_OPENGL_PKGCONFIGS_REMOVE = ""
IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"

2
recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4+fslc.bb
View File

@ -17,4 +17,4 @@ S = "${WORKDIR}/git"
inherit module
KERNEL_MODULE_AUTOLOAD = "galcore"
COMPATIBLE_MACHINE = "(imx)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

2
recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb
View File

@ -23,4 +23,4 @@ inherit module
EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m"
KERNEL_MODULE_AUTOLOAD = "galcore"
COMPATIBLE_MACHINE = "(imx)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

2
recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb
View File

@ -16,4 +16,4 @@ S = "${WORKDIR}/git/vvcam/v4l2"
inherit module
COMPATIBLE_MACHINE = "(mx8mp)"
COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

0
recipes-kernel/linux/linux-fslc-imx/imx/defconfig → recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
View File

0
recipes-kernel/linux/linux-fslc-imx/mx8/defconfig → recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
View File

2
recipes-kernel/linux/linux-fslc-imx_5.10.bb
View File

@ -87,4 +87,4 @@ LOCALVERSION = "-5.10.52-2.1.0"
DEFAULT_PREFERENCE = "1"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

0
recipes-kernel/linux/linux-fslc-lts/mxs/defconfig → recipes-kernel/linux/linux-fslc-lts/mxs-generic-bsp/defconfig
View File

2
recipes-kernel/linux/linux-fslc-lts_5.10.bb
View File

@ -24,4 +24,4 @@ LINUX_VERSION = "5.10.93"
KBRANCH = "5.10.x+fslc"
SRCREV = "de6a8455baae279feddb56c99056aa075175cd68"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"

0
recipes-kernel/linux/linux-fslc/mxs/defconfig → recipes-kernel/linux/linux-fslc/mxs-generic-bsp/defconfig
View File

2
recipes-kernel/linux/linux-fslc_5.15.bb
View File

@ -24,4 +24,4 @@ LINUX_VERSION = "5.15.16"
KBRANCH = "5.15.x+fslc"
SRCREV = "d084d166324389d09f73d8f2e91b989d69432335"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"

0
recipes-kernel/linux/linux-imx/imx/defconfig → recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
View File

0
recipes-kernel/linux/linux-imx/mx8/defconfig → recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
View File

2
recipes-kernel/linux/linux-imx_5.10.bb
View File

@ -30,4 +30,4 @@ LINUX_VERSION = "5.10.72"
DEFAULT_PREFERENCE = "1"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

4
recipes-multimedia/alsa/alsa-lib_%.bbappend
View File

@ -6,6 +6,6 @@ IMX_PATCH = " \
file://0005-add-ak4458-conf-for-multichannel-support.patch \
file://0006-add-conf-for-iMX-XCVR-sound-card.patch \
"
SRC_URI:append:imx = "${IMX_PATCH}"
SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
PACKAGE_ARCH:imx = "${MACHINE_SOCARCH}"
PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"

2
recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb
View File

@ -33,4 +33,4 @@ FILES:${PN} += "${libdir}/alsa-lib/libasound_*.so"
FILES:${PN}-dbg += "${libdir}/alsa-lib/.debug"
FILES:${PN}-dev += "${libdir}/alsa-lib/*.la"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
View File

@ -23,4 +23,4 @@ inherit meson pkgconfig upstream-version-is-even
FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
COMPATIBLE_MACHINE = "(imx)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

8
recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb
View File

@ -1,14 +1,14 @@
require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
DEPENDS:append:imxgpu2d = " virtual/libg2d"
DEPENDS:append:mx8 = " libdrm"
DEPENDS:append:mx8-nxp-bsp = " libdrm"
PACKAGECONFIG:append:mx8 = " kms tinycompress"
PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress"
DEFAULT_PREFERENCE = "-1"
PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}"
PACKAGE_ARCH:mx8 = "${MACHINE_SOCARCH}"
PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_SOCARCH}"
GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https;branch=master"
SRCBRANCH = "MM_04.06.01_2105_L5.10.y"
@ -160,4 +160,4 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"
# include fragment shaders
FILES:${PN}-opengl += "/usr/share/*.fs"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb
View File

@ -99,4 +99,4 @@ def get_opengl_cmdline_list(switch_name, options, d):
CVE_PRODUCT += "gst-plugins-base"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb
View File

@ -74,4 +74,4 @@ EXTRA_OEMESON += " \
FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

6
recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb
View File

@ -42,8 +42,8 @@ PACKAGECONFIG:append:imxpxp = " pxp"
# The 2D blitter sinks require an MXC framebuffer, which
# is not available anymore on the i.MX8 (since these SoCs
# now use KMS instead of the old Linux framebuffer).
PACKAGECONFIG:append:mx6 = " imx2dvideosink v4l2"
PACKAGECONFIG:append:mx7 = " imx2dvideosink"
PACKAGECONFIG:append:mx6-nxp-bsp = " imx2dvideosink v4l2"
PACKAGECONFIG:append:mx7-nxp-bsp = " imx2dvideosink"
PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}"
PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled,"
@ -59,4 +59,4 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
# the following line is required to produce one package for each plugin
PACKAGES_DYNAMIC = "^${PN}-.*"
COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d|mx8)"
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)"

2
recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb
View File

@ -42,4 +42,4 @@ EXTRA_OEMESON += " \
FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
COMPATIBLE_MACHINE = "(imx)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

2
recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb
View File

@ -29,4 +29,4 @@ GIR_MESON_DISABLE_FLAG = "disabled"
# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
COMPATIBLE_MACHINE = "(imx)"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

2
recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb
View File

@ -79,4 +79,4 @@ CVE_PRODUCT = "gstreamer"
PTEST_BUILD_HOST_FILES = ""
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

30
recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb
View File

@ -8,8 +8,8 @@ LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1"
SECTION = "multimedia"
DEPENDS = "imx-codec imx-parser gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
DEPENDS:append:mx6 = " imx-lib"
DEPENDS:append:mx7 = " imx-lib"
DEPENDS:append:mx6-nxp-bsp = " imx-lib"
DEPENDS:append:mx7-nxp-bsp = " imx-lib"
DEPENDS:append:imxvpu = " imx-vpuwrap libdrm"
# For backwards compatibility
@ -30,14 +30,14 @@ S = "${WORKDIR}/git"
inherit meson pkgconfig use-imx-headers
PLATFORM:mx6 = "MX6"
PLATFORM:mx6sl = "MX6SL"
PLATFORM:mx6sx = "MX6SX"
PLATFORM:mx6ul = "MX6UL"
PLATFORM:mx6sll = "MX6SLL"
PLATFORM:mx7= "MX7D"
PLATFORM:mx7ulp= "MX7ULP"
PLATFORM:mx8 = "MX8"
PLATFORM:mx6-nxp-bsp = "MX6"
PLATFORM:mx6sl-nxp-bsp = "MX6SL"
PLATFORM:mx6sx-nxp-bsp = "MX6SX"
PLATFORM:mx6ul-nxp-bsp = "MX6UL"
PLATFORM:mx6sll-nxp-bsp = "MX6SLL"
PLATFORM:mx7-nxp-bsp= "MX7D"
PLATFORM:mx7ulp-nxp-bsp= "MX7ULP"
PLATFORM:mx8-nxp-bsp = "MX8"
# Todo add a mechanism to map possible build targets
EXTRA_OEMESON = "-Dplatform=${PLATFORM} \
@ -49,10 +49,10 @@ PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN
# Add codec list that the beep plugin run-time depended
BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis"
RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux "
RDEPENDS:${PN}:append:mx8qm = " imx-dsp"
RDEPENDS:${PN}:append:mx8qxp = " imx-dsp"
RDEPENDS:${PN}:append:mx8mp = " imx-dsp"
RDEPENDS:${PN}:append:mx8ulp = " imx-dsp"
RDEPENDS:${PN}:append:mx8qm-nxp-bsp = " imx-dsp"
RDEPENDS:${PN}:append:mx8qxp-nxp-bsp = " imx-dsp"
RDEPENDS:${PN}:append:mx8mp-nxp-bsp = " imx-dsp"
RDEPENDS:${PN}:append:mx8ulp-nxp-bsp = " imx-dsp"
# overlaysink rely on G2D,
# cannot be supported on i.MX6SLL & i.MX6UL & i.MX6ULL & i.MX7D
@ -82,4 +82,4 @@ FILES:${PN}-grecorder = "${bindir}/grecorder-1.0"
FILES:${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}"
FILES:${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-multimedia/imx-codec/imx-codec_4.6.2.bb
View File

@ -116,4 +116,4 @@ FILES:${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux
FILES:${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb
View File

@ -18,4 +18,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
INSANE_SKIP:${PN} = "arch dev-so"
FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm"
COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)"
COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"

6
recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb
View File

@ -19,8 +19,8 @@ EXTRA_OECONF += " \
RDEPENDS:${PN} += " imx-dsp-codec-ext"
HIFI4_BIN ?= "hifi4_imx8qmqxp.bin"
HIFI4_BIN:mx8mp = "hifi4_imx8mp.bin"
HIFI4_BIN:mx8ulp = "hifi4_imx8ulp.bin"
HIFI4_BIN:mx8mp-nxp-bsp = "hifi4_imx8mp.bin"
HIFI4_BIN:mx8ulp-nxp-bsp = "hifi4_imx8ulp.bin"
do_install:append () {
# Rename DSP Firmware into hifi4.bin and remove unneeded binary
@ -42,4 +42,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
INHIBIT_SYSROOT_STRIP = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8mp|mx8ulp)"
COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"

2
recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb
View File

@ -19,4 +19,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
FILES:${PN} += "/unit_tests ${datadir}/imx-mm"
COMPATIBLE_MACHINE = "(mx8)"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"

2
recipes-multimedia/imx-parser/imx-parser_4.6.2.bb
View File

@ -41,4 +41,4 @@ FILES:${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}"
INHIBIT_SYSROOT_STRIP = "1"
COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

2
recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.1.bb
View File

@ -15,4 +15,4 @@ INSANE_SKIP:${PN} = "already-stripped"
FILES:${PN} += "${datadir}/imx-mm"
COMPATIBLE_MACHINE = "(mx8)"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"

2
recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.6.2.bb
View File

@ -8,7 +8,7 @@ SECTION = "multimedia"
LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
DEPENDS = "virtual/imxvpu"
DEPENDS:append:mx8mp = " imx-vpu-hantro-vc"
DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"

Some files were not shown because too many files have changed in this diff Show More