summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
Commit message (Collapse)AuthorAgeFilesLines
* imx-base.inc: Add support to include extra data for NIP devicestopic/better-nip-supportOtavio Salvador2022-02-231-0/+3
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* Rework machine definitions to reduce duplicationOtavio Salvador2022-02-213-3/+3
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: reduce code using imx-{mainline,nxp}-bsp overridesOtavio Salvador2022-02-211-20/+13
| | | | | | | We reduce the code size using the new overrides to improve code clearness and reduce boilerplate. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* Generalize overrides subsystem for NXP and Mainline supportOtavio Salvador2022-02-211-147/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Merge pull request #965 from thochstein/masterOtavio Salvador2022-02-101-6/+6
|\ | | | | Update graphics for L5.10.72-2.2.0
| * wayland-protocols: Upgrade to 1.22.imxTom Hochstein2022-01-291-3/+3
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * libdrm: Upgrade to 2.4.107.imxTom Hochstein2022-01-281-3/+3
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | imx-base: Install the driver when nxp8987 in MACHINE_FEATURESDaiane Angolini2022-02-011-0/+3
|/ | | | Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
* imx8x-mek.inc: Remove obsolete dtb for DSPVinicius Aquino2021-11-031-1/+0
| | | | | | Some dtb for DSP were removed from the kernel. Signed-off-by: Vinicius Aquino <vinicius.aquino@ossystems.com.br>
* mx25pdk: Remove machine due to its deadlineVinicius Aquino2021-10-191-2/+0
| | | | | | The commit 2610bf14 from u-boot-fslc removes support for mx25pdk Signed-off-by: Vinicius Aquino <vinicius.aquino@ossystems.com.br>
* Merge pull request #856 from thochstein/gstreamerOtavio Salvador2021-09-101-5/+7
|\ | | | | Gstreamer: Upgrade to 1.18.0[.imx]
| * imx-base.inc: Set gstreamer preferred version to 1.18.0[.imx]Tom Hochstein2021-09-011-5/+7
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | imx8mm-evk.inc: Drop qca9377Tom Hochstein2021-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build for kernel-module-qca9377 is broken: ``` | /.../yocto/master/build/tmp/work/imx8mm_lpddr4_evk-fsl-linux/kernel-module-qca9377/3.1-r0/git/CORE/SERVICES/COMMON/adf/linux/adf_os_dma_pvt.h:104:25: error: 'DMA_ATTR_NON_CONSISTENT' undeclared (first use in this function) | 104 | DMA_ATTR_NON_CONSISTENT); | | ^~~~~~~~~~~~~~~~~~~~~~~ ``` The Linux API here is changed for 5.10, so the i.MX fork is now incompatible. Nothing suitable is found in Qualcomm's source either, so drop qca9377. Fixes: #851 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | conf: machine: imx8m: correct tune for mainline bspAndrey Zhizhikin2021-08-273-0/+15
|/ | | | | | | | | | | | Mainline BSP does not contain imx8m in machine overrides, which causes generic tunes to be set for i.MX8M derivates, rather than a more precise tune which enables crypto extension. Those extensions are enabled in NXP BSP due to those settings rely on machine overrides. Adapt tunes for Mainline BSP in machine include files to include crypto extensions and align it with NXP BSP. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* imx-base.inc: Define a default value for OPTEE_BIN_EXTTom Hochstein2021-08-241-0/+1
| | | | | | | | | | | | | | Without a default the IMAGE_BOOT_FILES is not parsed properly, leading to the following error for machines without such a variable definition: ``` | ERROR: _exec_cmd: install -m 0644 -D /z/build-master/imx233-olinuxino-maxi/build/tmp-glibc/deploy/images/imx233-olinuxino-maxi/make_dtb_boot_files /z/build-master/imx233-olinuxino-maxi/build/tmp-glibc/work/imx233_olinuxino_maxi-oe-linux-gnueabi/core-image-base/1.0-r0/tmp-wic/boot.2/make_dtb_boot_files returned '1' instead of 0 | output: install: cannot stat '/z/build-master/imx233-olinuxino-maxi/build/tmp-glibc/deploy/images/imx233-olinuxino-maxi/make_dtb_boot_files': No such file or directory ERROR: Task (/opt/oe/configs/z/build-master/imx233-olinuxino-maxi/layers/openembedded-core/meta/recipes-core/images/core-image-base.bb:do_image_wic) failed with exit code '1' ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Fix optee boot imagesTom Hochstein2021-08-211-2/+2
| | | | | | | | For optee support tee.bin is needed in the image. The optee image uTee is renamed with an SOC qualifier. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* machines: Adjust for using new location of tune files from coreKhem Raj2021-08-1811-11/+11
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* imx-base.inc: Fix another overrideTom Hochstein2021-08-121-1/+1
| | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* layer: More override fixesTom Hochstein2021-08-121-8/+8
| | | | | | | | | | Adds fixes for _imx, _imxdpu, _imxdrm, _imxgpu, _imxgpu3d, virtual PREFERRED_PROVIDER versions Fix other places for imx/imxdpu/imxdrm overrides Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* conf: machine: imx8m*: convert exlinux syntax to new overridesAndrey Zhizhikin2021-08-123-12/+12
| | | | | | | | | | New override mechanism uses ":" instead of "_", this causes the extlinux variables defined in machine include files not ot be set proper. Correct exlinux variables syntax to adhere to new overrides. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* layer: Convert to new override syntaxKhem Raj2021-08-1211-227/+227
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* imx8mp-evk.inc: Make jailhouse specific to NXP BSPTom Hochstein2021-07-291-2/+3
| | | | | | | Align the jailhouse enablement for i.MX 8M Plus EVK with the other 8M EVK machines, making jailhouse specific to NXP BSP. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* jailhouse: Drop from MACHINE_FEATURES_BACKFILLTom Hochstein2021-07-292-6/+3
| | | | | | | | The backfill feature is for features that were once always enabled without the ability to disable them. This is not true of jailhouse; it has always had a feature allowing it to be disabled. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8qxp-mek: Move ATF_PLATFORM and IMX_BOOT_SOC_TARGETTom Hochstein2021-05-211-5/+0
| | | | | | | | The values of ATF_PLATFORM and IMX_BOOT_SOC_TARGET are not shared by imx8dx-mek, so move them out of imx8x-mek.inc and into the machine config file itself. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* conf: machine: imx8m[m,n,p]: enable extlinux supportAndrey Zhizhikin2021-05-043-0/+57
| | | | | | | | | | | | | | | | Newer U-Boot versions enables distro boot option as a default. This requires that the target uses either Syslinux or boot script in order to start instead of customized boot environment. Since according to U-Boot documentation [1], Syslinux is considered as a preferred way of using distro boot - enable it for imx8mm, imx8mn and imx8mp derivatives for mainline BSP. Syslinux options are introduced in machine-specific headers in order to assemble correct extlinux.conf file. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> Link: [1]: https://source.denx.de/u-boot/u-boot/-/blob/master/doc/README.distro
* imx-base.inc: use new wks file for boot containerAndrey Zhizhikin2021-05-041-10/+9
| | | | | | | | | | | | | Boot container provided by mainline U-Boot build can be used directly in the result image file, as it requires two binary files to be populated onto raw partition, hence it uses separate image generation scheme from imx-boot provided by NXP. Use new WKS file for mainline BSP built for aarch64 which picks up and packs boot container binary files from U-Boot directly into result image. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* imx-base.inc: Fix opencv preferred versionTom Hochstein2021-05-041-1/+1
| | | | | | The i.MX fork of opencv is upgraded to 4.5.2.imx. Fix the preferred version. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: use 0x80008000 as the UBOOT_ENTRYPOINT for mx6ul, mx6ull and ↵Marc Ferland2021-05-041-3/+3
| | | | | | | | | | mx6ulz Based on the different reference manuals, the DDR controller for the mx6ul, mx6ull and mx6ulz is at 0x80000000 and not 0x10000000 like the imx6 dual or quad for example. Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
* Move mesa/etnaviv to xf86-video-modesettingAndreas Müller2021-04-201-1/+5
| | | | | | | * armada sources are gone finally * glmark2-es2 performance is almost doubled 87 -> 162 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* ls1043/ls1046: add wic.bz2 as default IMAGE_FSTYPESTing Liu2021-04-201-0/+2
| | | | Signed-off-by: Ting Liu <ting.liu@nxp.com>
* qoriq: remove ext2.gz from default IMAGE_FSTYPESTing Liu2021-04-201-1/+1
| | | | | | | | | | The classic initial ramdisk has been replaced by the much more flexible and efficient initramfs a long time. Kernel warns about it being removed soon. Remove ext2.gz from default IMAGE_FSTYPES. Signed-off-by: Ting Liu <ting.liu@nxp.com>
* ls1043/ls1046: support WIC image generationTing Liu2021-04-201-0/+23
| | | | Signed-off-by: Ting Liu <ting.liu@nxp.com>
* u-boot-imx-tools: Drop i.MX specific toolsOtavio Salvador2021-04-181-5/+0
| | | | | | | | | | | We are building same tools as the original U-Boot thus we should rely on them. This is critical as native tools cannot vary between machines as there are no clear reason to convert this to be a cross tool as we build no machine specific code. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: Provide a default value for SPL_BINARYOtavio Salvador2021-04-142-1/+7
| | | | | | | | | This fixes the build case when machine does not use SPL and does not set it. We couldn't use dynamic expansion or we trigger a recursive expansion so we opted to use an utility function to do the proper logic. Fixes: f98059fe ("imx-base.inc: Allow use of SPL_BINARY variable inside wic images") Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: Allow use of SPL_BINARY variable inside wic imagesOtavio Salvador2021-04-131-0/+4
| | | | | Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic") Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: Fix mfgtool selection for u-boot-fslcOtavio Salvador2021-04-131-1/+2
| | | | | | | | | For eventual use of u-boot-fslc as mfgtool flavor, this will need to be provided as an extra UBOOT_CONFIG thus reusing same provider. This fix some build errors with external layers. Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic") Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx8dxl-lpddr4-evk: Rework machine for re-useTom Hochstein2021-04-101-0/+62
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* conf: imx8mp-evk.inc: correct u-boot make targetAndrey Zhizhikin2021-04-071-1/+1
| | | | | | | | | | | | | U-Boot make target set to empty string does not expand correctly for mainline BSP build, which append make target with 'flash.bin' entry. This causes the build to fail, since the u-boot.bin target is not produced when only 'flash.bin' is present in the make target list. Define the default make target to 'all', which allows proper build target expansion. Fixes: 823a97cf ("imx8mp-lpddr4-evk: Rework 8M Plus EVK config file") Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* imx8mp-lpddr4-evk: Rework 8M Plus EVK config fileTom Hochstein2021-03-301-0/+55
| | | | | | | | | There are two variants of the 8M Plus Evaluation Kit board, one with LPDDR4 and one with DDR4. Rework our existing config file to make this distinction explicit in the machine config file name and to allow for configuration re-use. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Rework the u-boot-fslc and u-boot-imx settings logicOtavio Salvador2021-03-244-10/+58
| | | | | | | | | | We need to make it more obvious what is in use, when we support both bootloaders and for it we are now using the _pn suffix for both. This also fixes the WIC_FILE depending on the choice otherwise image build fails. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: Allow override of IMX_DEFAULT_BOOTLOADEROtavio Salvador2021-03-241-2/+2
| | | | | | | We need to allow the override of the variable in 'local.conf' or other places, so we cannot overwrite it inside imx-base.inc. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* conf: machine: imx8m: make optee feature nxp dependentAndrey Zhizhikin2021-03-172-4/+8
| | | | | | | | | Mainline BSP does have lockups in boot when OP-TEE is included in the build. Make optee feature enabled only when NXP BSP flavor is chosen. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* conf: machine: mx8m[m,n,p]: use boot container classAndrey Zhizhikin2021-03-172-4/+14
| | | | | | | | | | | | | | | Use the new boot container build on mainline BSP for mx8mm, mx8mn and mx8mp machines. Boot container serves as a replacement for imx-boot package present in NXP BSP, and is created by U-Boot build system. Define ATF machine name and required load address. Define dependency on firmware package, as it provides DDR firmware binaries needed to construct boot container. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* imx-base.inc: add boot container condition and wks dependencyAndrey Zhizhikin2021-03-171-1/+31
| | | | | | | | | | | | | | | | Boot container provided by mainline U-Boot build can be used directly int the result image file, and does not depends on the imx-boot component provided by NXP. Define variable to be used for conditional inheritance on the imx-boot-container class when 'imx-boot-container' is present in machine overrides. Modify WKS dependency to imx-boot for mainline BSP built for aarch64 to use imx-boot when derivative does not set the boot container compatibility in its overrides. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* optee-imx: Upgrade to 3.10.0Tom Hochstein2021-03-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all recipes to pull sources from imx_5.4.70_2.3.0 branch in NXP upstream and update SRCREV to match release tags. Update PREFERRED_VERSION of optee for mx8 to point to 3.10.0.imx. Following notes are additions to the version update of recipes: -------------------------- optee-client: - Drop CFLAGS patch as it is already applied upstream optee-os: - Drop gcc10 patch as it is already applied upstream - Add dependency on python3-pycryptodomex-native - Drop NOWERROR flag as package is reworked to disable warnings by default - Rework mkimage load address since tee-init_load_addr.txt is no longer created optee-test: - Drop python3 patch as it is already applied upstream - Remove unused patch files from layer - Add dependency on python3-pycryptodomex-native - Add sysroot to C and C++ flags Fixes #686, fixes #689. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: CleanupTom Hochstein2021-03-131-2/+1
| | | | | | | - Remove redundant variable assignment - Move creeping comment back where it belongs Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base: use i.MX opencv version for mx8Chris Dimich2021-03-021-0/+3
| | | | | | Use i.MX fork to support additional machine learning demos and tiny dnn. Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
* imx-base: cleanup u-boot-toolsMax Krummenacher2021-02-221-4/+5
| | | | | | | | | | | | | There is no u-boot-fslc-tools recipe and thus the PREFERRED_PROVIDER is not available for u-boot-tools. Prevents: | NOTE: Multiple providers are available for u-boot-mkimage-native (u-boot-imx-tools-native, u-boot-tools-native) | Consider defining a PREFERRED_PROVIDER entry to match u-boot-mkimage-native | NOTE: Multiple providers are available for runtime nativesdk-u-boot-mkimage (nativesdk-u-boot-imx-tools, nativesdk-u-boot-tools) | Consider defining a PREFERRED_RPROVIDER entry to match nativesdk-u-boot-mkimage Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* imx-base.inc: Add PREFERRED_PROVIDER_u-boot-mfgtoolTom Hochstein2021-02-091-0/+1
| | | | | | | Add a preferred provider for u-boot-mfgtool since it also has both a community and an i.MX version. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* gstreamer1.0*: Fix versions for i.MX fork recipesTom Hochstein2021-02-011-4/+4
| | | | | | | | | | | | | The gstreamer1.0 recipes for the i.MX forks were updated to a newer version, but the file versions were not updated accordingly. For the NXP 5.4.47 release, the gstreamer version is 1.16.2.imx. For NXP 5.4.70, the gstreamer version is 1.16.3.imx. Note that the original version 1.16.imx was not appropriate either, and this fix can also be viewed from that perspective, that the third digit of the version should be included in the recipe version. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>