summaryrefslogtreecommitdiffstats
path: root/conf/machine
Commit message (Collapse)AuthorAgeFilesLines
* 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-ddr3-evk: Add support for 8DXLite EVK with DDR3Tom Hochstein2021-04-101-0/+9
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8dxl-lpddr4-evk: Rework machine for re-useTom Hochstein2021-04-102-17/+30
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8dxl-evk: Set NXP BSP as default and add device treeTom Hochstein2021-04-101-0/+3
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx6ulevk: Fix comment about SPL supportOtavio Salvador2021-04-101-2/+1
| | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Change-Id: If9e1b788bebeef4429a2ed71756aac54629cba30
* imx8mp-ddr4-evk: Set mainline BSP to use u-boot-imx for nowTom Hochstein2021-04-071-0/+4
| | | | | | | | Since u-boot-fslc doesn't yet support this machine, set the configuration for mainline BSP to use u-boot-imx. Fixes #710. 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-ddr4-evk: Add machine config for i.MX 8M Plus EVK with DDR4Tom Hochstein2021-03-301-0/+23
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mp-lpddr4-evk: Rework 8M Plus EVK config fileTom Hochstein2021-03-303-93/+102
| | | | | | | | | 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-2425-31/+187
| | | | | | | | | | 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>
* imx6qdlsabreauto: Rework u-boot-imx defconfig as distro agnosticOtavio Salvador2021-03-241-3/+3
| | | | | | We now bind the defconfig to the 'u-boot-imx' package. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx6qdlsabresd: Rework u-boot-imx defconfig as distro agnosticOtavio Salvador2021-03-241-3/+3
| | | | | | We now bind the defconfig to the 'u-boot-imx' package. 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>
* Revert "imx6*.conf: Rework machine assignments for u-boot variables"Otavio Salvador2021-03-243-18/+15
| | | | This reverts commit cc4b91bf3a3cf5c2034372c607783048aae44b65.
* imx8dxl-evk: Set ATF_PLATFORM and IMX_BOOT_SOC_TARGETOtavio Salvador2021-03-241-0/+3
| | | | | | This sets the required variables so the target is buildable. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx51evk: Drop old perf fixup as we now use Linux mainlineOtavio Salvador2021-03-241-3/+0
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx28evk: Drop unused IMXBOOTLETS_MACHINE variableOtavio Salvador2021-03-241-2/+0
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* conf: machine: imx8m: make optee feature nxp dependentAndrey Zhizhikin2021-03-173-6/+13
| | | | | | | | | 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-174-11/+28
| | | | | | | | | | | | | | | 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>
* imx6*.conf: Rework machine assignments for u-boot variablesTom Hochstein2021-03-133-15/+18
| | | | | | | | | | | | | | | | | | The u-boot settings in imx6qdlsabresd, imx6qdlsabreauto, and imx6ulevk are set to values that are correct for u-boot-fslc. Attempts to override these settings to fix u-boot-imx builds have broken u-boot-fslc builds, and vice versa. The u-boot-imx build is currently broken: ``` | install: cannot stat '/opt/work/upstream/fsl-xwayland/tmp/work/imx6qdlsabresd-fsl-linux-gnueabi/u-boot-imx/2020.04-r0/build/u-boot.img': No such file or directory ``` Rework the u-boot-fslc-specific overrides so they are used conditionally only for u-boot-fslc. The default settings are correct for u-boot-imx. Fixes: 880dbf2 ("fsl-base.inc: use conditional assignment for base variables") Fixes: e83f54d ("machines: imx-base.inc: fix failing u-boot builds") 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>
* imx8qm-mek: Fix SPL_BINARY assignmentTom Hochstein2021-02-131-1/+1
| | | | | | | | | | | | | | | The SPL_BINARY was no longer being set properly after the machine name change from imx8qmmek to imx8qm-mek, resulting in the following build break for imx-boot: ``` | make[1]: *** No rule to make target 'u-boot-spl.bin', needed by 'flash_spl'. Stop. ``` The override of the machine name is of course redundant here, so just drop the override. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8qm-mek: Add device tree for esaiTom Hochstein2021-02-121-0/+1
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mq-evk: Add device trees for rm67199Tom Hochstein2021-02-121-0/+2
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mm-lpddr4-evk: Add device tree for QCA Wi-FiTom Hochstein2021-02-121-0/+1
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.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>
* imx8mp-evk: update ddr firmware version as required by imx-bootAndrey Zhizhikin2021-02-011-4/+5
| | | | | | | | | | | | | imx-boot update 5.4.70_2.3.0 requires a new version of ddr firmware to be deployed and used for imx8mp machine (201904 -> 202006). This is introduced in commits of imx-boot git tree: 322a834 ("MLK-24860 iMX8MP: Use 202006 DDR4 firmware") 658c54a ("MLK-24788 iMX8MP: Update LPDDR4 Firmware to 202006 version") Update ddr firmware name to include new version in machine config file. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* imx8mm-lpddr4-evk: follow changed device tree nameMax Krummenacher2021-02-013-1/+2
| | | | | | | | The kernel from rel_imx_5.4.70_2.3.0 got one device tree name changed: imx8mm-evk-revb.dts -> imx8mm-evk-revb-qca-wifi.dts Follow that in the machine config to keep the machine buildable. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* imx-base: upgrade to release 5.4.70_2.3.0Max Krummenacher2021-02-011-7/+10
| | | | | | | | | Update PREFERRED to release 5.4.70_2.3.0. imx-gpu-viv now has opencl-clhpp in PROVIDES. Set this as the preferred provider. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* imx-base.inc: add Gstreamer default for all iMX8 familiesPierluigi Passaro2021-01-311-0/+9
| | | | | | | | Set MACHINE_GSTREAMER_1_0_PLUGIN for mx8mq, mx8qm and mx8qxp machines. Also, set PREFERRED_VERSION_gstreamer1.0 and related plugins for all mx8 machines. Signed-off-by: Pierluigi Passaro <pierluigi.p@variscite.com>
* imx-base.inc: Set imx-gpu-viv as preferred provider for OpenCLTom Hochstein2021-01-261-0/+2
| | | | | | Use imx-gpu-viv for hardware-accelerated OpenCL implementation. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-gpu-viv: Align OpenCL package namesTom Hochstein2021-01-261-2/+2
| | | | | | | | The existing OpenCL recipes opencl-headers and opencl-icd-loader are dependencies for clinfo. In order to build clinfo with imx-gpu-viv as provider, fix imx-gpu-viv to provide the same recipe names. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* machines: imx-base.inc: fix failing u-boot buildsMax Krummenacher2021-01-263-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | If using a fsl-xxx distro the prefered provider of U-Boot is u-boot-imx. That U-Boot didn't make the switch to a unified dl/q/qp binary and does not use an spl. For the imx6ulevk it does not use an spl. The below commits try to address that, however the change is not limited to - the fsl distro but rather uses use-nxp-bsp which can be used with any distro - some machines which do not use u-boot-imx, e.g. colibri-imx6 now fail. Fix this by moving the configuration into the affected distro in meta-freescale-distro and the machines. Fixes: c9757ea3 ("imx-base.inc: Fix use-nxp-bsp after rework") 77e56f30 ("imx-base.inc: Limit use-fsl-bsp u-boot overrides to i.MX 6 and 7") e5cd33c9 ("u-boot.imx: Add u-boot configuration for fsl") Build tested with fsl-xwayland & use-nxp-bsp for imx6qdlsabreauto, imx6qdlsabresd, and imx6ulevk. Build tested with the fslc-xwayland & use-nxp-bsp for imx6qdlsabreauto, imx6qdlsabresd, imx6ulevk, and colibri-imx6. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* imx8dx-mek: Rework 8DXP MEK to use common MEK includeTom Hochstein2021-01-212-73/+12
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8qxp-mek.conf: Rework 8QXP MEK to capture commonalityTom Hochstein2021-01-212-36/+47
| | | | | | | | | | | The 8QuadXPlus and 8DualXPlus are identical except for core number, and the Multisensory Environment Kit board for each is the same. Rework the configuration to better capture the commonality. Also, rename the machine to match the devicetree name, which also improves readability. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mm-*-evk: Split 8M Mini EVK for LPDDR4 and DDR4 variantsTom Hochstein2021-01-214-83/+104
| | | | | | | | | | | | The 8M Mini Evaluation Kit has two variants, one for LPDDR4 and one for DDR4, with two corresponding sets of image components. The current machine configuration places both sets into a single image and boots for LPDDR4. The user must manually update the image to make it work for the DDR4 EVK variant. Simplify the DDR4 case by providing a dedicated machine configuration. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mn-lpddr4-evk: Add support for 8M Nano EVK with LPDDR4Tom Hochstein2021-01-211-0/+21
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mn-ddr4-evk: Rework 8M Nano EVK config fileTom Hochstein2021-01-213-76/+71
| | | | | | | | | There are two variants of the 8M Nano 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>
* imx8dxl-evk: Add new board i.MX DXL EVKTom Hochstein2021-01-212-0/+59
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8dxmek: Add new board i.MX 8DX MEKTom Hochstein2021-01-211-0/+73
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8qxpmek: Add PCI, OP-TEE, Broadcom WiFi, and device treesTom Hochstein2021-01-211-10/+32
| | | | | | | | | | | | | Fix missing pci support. Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc. Enable Broadcom 4356, 4359, and 43455 WiFi modules. Add device trees for PCIE EP, lcdif, and rpmsg. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8qm-mek: Rename, update to B0, add PCI, OP-TEE, Broadcom WiFi, and device ↵Tom Hochstein2021-01-212-67/+85
| | | | | | | | | | | | | | | | | | | trees Rename to match device tree name and improve readability. Update to B0, which requires boot seek of 32. Fix missing pci support. Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc. Enable Broadcom 4356, 4359, and 43455 WiFi modules. Add device trees for PCIE EP, lvds, Sound Open Firmware, and USD WiFi. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx8mq-evk: Separate device trees unique to linux-imxTom Hochstein2021-01-211-0/+2
| | | | | | Isolate device trees unique to linux-imx kernel to the NXP BSP. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>