summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ensure we fail if old SoC overrides are in usetopic/warn-old-overridesOtavio Salvador2022-03-033-0/+108
| | | | | | | | | To assist existing layers to convert to the new BSP-specific overrides. Besides failing the parsing of the recipes where it is in use, we provide a script to automate most of it. Fixes: #990. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* dynamic-layers: Update SOC overridesTom Hochstein2022-03-025-9/+9
| | | | | | Fix dynamic layer overrides missed by the script. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #986 from boundarydevices/masterOtavio Salvador2022-02-251-0/+1
|\ | | | | linux-imx-headers: whitelist version.h header (Fixes Hantro VPU for honister/master)
| * linux-imx-headers: whitelist version.h headerGary Bisson2022-02-251-0/+1
|/ | | | | | | | | | | As some recipes, like imx-vpu-hantro, need to know the imx kernel version instead of the toolchain header version. As an example, Honister toolchain uses 5.14 kernel headers. In that case, imx-vpu-hantro believes it needs to use dmabuf allocation mechanism although this latter will only be enabled in upcoming NXP kernel 5.15. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
* Merge pull request #985 from thochstein/opteeOtavio Salvador2022-02-244-39/+51
|\ | | | | Optee: Upgrade 3.10.0.imx -> 3.15.0.imx
| * optee-test: Add runtime dependency on optee-osTom Hochstein2022-02-241-0/+2
| | | | | | | | | | | | The TAs in optee-os are required. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-client: Fix incorrect packaging logicTom Hochstein2022-02-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | - The logic for the tee-supplicant package doesn't work and the package ends up empty. In fact, tee-supplicant belongs in the main package anyway. - The main package already contains ${libdir}, so drop the redundant assignment. - The headers belong in the -dev package, so drop them from the main. - Drop the un-necessary INSANE_SKIP settings. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-*: For i.MX, require machine feature opteeTom Hochstein2022-02-243-5/+11
| | | | | | | | | | | | | | | | The optee software should be enabled by the machine feature. If the machine feature is not there, but optee is built anyway, then something is wrong and the build should fail. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-test: Use openssl embedded in optee-testTom Hochstein2022-02-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building against openssl from Yocto results in a build break: ``` | /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-fsl-linux/optee-test/3.15.0.imx-r0/git/host/xtest/regression_8100.c:133:17: error: 'ERR_get_error_line' is deprecated: Since OpeSL 3.0 [-Werror=deprecated-declarations] | 133 | e = ERR_get_error_line(&f, &l); | | ^ | In file included from /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-fsl-linux/optee-test/3.15.0.imx-r0/git/host/xtest/regression_8100.c:18: | /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-fsl-linux/optee-test/3.15.0.imx-r0/recipe-sysroot/usr/include/openssl/err.h:411:15: note: declared here | 411 | unsigned long ERR_get_error_line(const char **file, int *line); | | ^~~~~~~~~~~~~~~~~~ ``` Configure optee-test to build with its own openssl. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-test: Add missing license GPL-2.0Tom Hochstein2022-02-241-1/+1
| | | | | | | | | | | | | | As the license file states, the client applications (optee_test/host/*) are provided under the GPL-2.0 license. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-test: Upgrade 3.10.0.imx -> 3.15.0.imxTom Hochstein2022-02-242-4/+8
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-test: Cleanup install and FILESTom Hochstein2022-02-241-5/+5
| | | | | | | | | | | | | | - Use variables properly for the install and FILES - Simplify the FILES update with an append Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-client: Upgrade 3.10.0.imx -> 3.15.0.imxTom Hochstein2022-02-242-7/+11
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-os: Install embedded TAsTom Hochstein2022-02-241-1/+7
| | | | | | | | | | | | | | optee-os has some embedded TAs like AVB or PKCS11 that must be installed in the filesystem. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-os: Use variable for includedir installTom Hochstein2022-02-241-2/+2
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-os: Use tee-raw.bin binaryTom Hochstein2022-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | During the optee-os compilation, the gen_tee_bin.py script generates a tee-raw.bin that is more space efficient and could replace the tee.bin binary manually generated in the optee-os recipe by objcpy. This patch greatly reduces the size of tee.bin. On 64 bits platforms, we observe a size descrease of ~68%, and on 32 bits platforms, a size decrease of ~45%. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * optee-os: Upgrade 3.10.0.imx -> 3.15.0.imxTom Hochstein2022-02-242-4/+3
|/ | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #984 from Freescale/topic/simplify-mx8xOtavio Salvador2022-02-242-3/+1
|\ | | | | imx8x: The mx8x override is handled in extender so drop it
| * imx8x: The mx8x override is handled in extender so drop itOtavio Salvador2022-02-242-3/+1
|/ | | | | Refs: 9b9f9bb1 ("imx-base.inc: Add missing mx8x overrides") Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* Merge pull request #983 from thochstein/mx8xOtavio Salvador2022-02-241-4/+4
|\ | | | | imx-base.inc: Add missing mx8x overrides
| * imx-base.inc: Add missing mx8x overridesTom Hochstein2022-02-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The i.MX 8QXP and 8DXL are in the 8X family, but the override was missed in the new SOC override rework. This causes do_compile for imx-boot to fail: ``` cp: cannot stat '/.../build/tmp/deploy/images/imx8qxpmek/imx8qm_m4_TCM_power_mode_switch_m40.bin': No such file or directory ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | Merge pull request #982 from Freescale/topic/better-nip-supportOtavio Salvador2022-02-231-0/+3
|\ \ | |/ |/| imx-base.inc: Add support to include extra data for NIP devices
| * 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>
* Merge pull request #980 from Freescale/topic/generalize-soc-overridesOtavio Salvador2022-02-23124-397/+422
|\ | | | | Generalize overrides subsystem for NXP and Mainline support
| * optee-os: Use SoC override for i.MX6UL, i.MX6ULL and i.MX6ULZtopic/generalize-soc-overridesOtavio Salvador2022-02-211-4/+4
| | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * Rework machine definitions to reduce duplicationOtavio Salvador2022-02-2113-13/+13
| | | | | | | | 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>
| * imx-gpu-viv: Remove comment code which was unusedOtavio Salvador2022-02-211-2/+0
| | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * Rework recipes to use imx-nxp-bsp more extensivelyOtavio Salvador2022-02-2114-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rework the recipes making use of new imx-nxp-bsp override; it has been applied to: - gstreamer1.0 - gstreamer1.0-plugins-bad - gstreamer1.0-plugins-base - gstreamer1.0-plugins-good - imx-alsa-plugins - imx-codec - imx-gst1.0-plugin - imx-parser - libdrm - libimxdmabuffer - linux-fslc-imx - linux-imx - optee-client - optee-test Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * u-boot-imx: Restrict recipe for i.MX6, i.MX7 and i.MX8Otavio Salvador2022-02-211-1/+1
| | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * u-boot-fslc-mxsboot: Restrict recipe for mxs-generic-bsp overrideOtavio Salvador2022-02-211-1/+1
| | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * imx-atf: Use mx8-generic-bsp as COMPATIBLE_MACHINEOtavio Salvador2022-02-211-1/+1
| | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * imx-vpu-hantro: Mark PACKAGE_ARCH as MACHINE_SOCARCHOtavio Salvador2022-02-212-0/+2
| | | | | | | | | | | | | | The compilation vary depending on the target SoC we wish to use so we must ensure it doesn't end in generic architecture feed. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * Rework recipes to use imx-generic-bsp more extensivelyOtavio Salvador2022-02-2112-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rework the recipes making use of new imx-generic-bsp override; it has been applied to: - alsa-state - firmware-imx - imx-kobs - imx-test - imx-uuc - linux-fslc - linux-fslc-lts - packagegroup-fsl-mfgtool - u-boot-fslc - uuu Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * firmware-imx-8m: Use mx8m-generic-bsp as COMPATIBLE_MACHINEOtavio Salvador2022-02-211-1/+1
| | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * Generalize overrides subsystem for NXP and Mainline supportOtavio Salvador2022-02-21110-365/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * classes/machine-overrides-extender: Postpone filter outOtavio Salvador2022-02-211-3/+4
| | | | | | | | | | | | | | The overrides ought to allow the filter out execution even for overrides included during the extension, for this to work we need to postpone it. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * classes/machine-overrides-extender: Allow filter out without an overrideOtavio Salvador2022-02-211-2/+2
| | | | | | | | | | | | | | We should be able to use a single MACHINEOVERRIDES_EXTENDER_FILTER_OUT definition, without an override, to reduce code duplication. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* | Merge pull request #981 from YoeDistro/yoe/mutOtavio Salvador2022-02-221-1/+1
|\ \ | |/ |/| layers: Bump to use kirkstone
| * layers: Bump to use kirkstoneKhem Raj2022-02-211-1/+1
|/ | | | | | its not going to be backward ABI compatible with honister due to variable renaming. Signed-off-by: Khem Raj <raj.khem@gmail.com>
* kernel-module-imx-gpu-viv: 6.4.0.p2.4+fslc -> 6.4.3.p2.4+fslcOtavio Salvador2022-02-211-1/+1
| | | | | | | | | | | | | | This includes folowing versions updates: 410ce59 Import 6.4.3.p2.4 original version e879a17 Import 6.4.3.p2.2 original version ae0f3be gc_hal_kernel_platform_imx.config: remove build time/user macros 8f1bf96 Import 6.4.3.p2.0 original version 4d97bab Import 6.4.3.p1.2 original version b0a9229 Import 6.4.3.p1.0 original version b4bed32 Import 6.4.3.p0.0 original version Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* Merge pull request #979 from zandrey/optee-fix-bsd-licenseOtavio Salvador2022-02-183-3/+3
|\ | | | | optee-imx: clarify BSD license
| * optee-imx: clarify BSD licenseAndrey Zhizhikin2022-02-183-3/+3
|/ | | | | | | | | | | | | | | | Since upstream commit 14d4c007c4 ("common-licences: remove ambiguous "BSD" license"), ambiguous "BSD" license has been removed from OE-Core. This triggers the warning message in QA: do_populate_lic_deploy: QA Issue: The license listed BSD was not in the licenses collected for recipe optee-os [license-file-missing] OP-TEE is licensed under "BSD-2-Clause" and license text clearly identifies it. Correct LICENSE variable to indicate proper License SPDX identifier. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* Merge pull request #978 from YoeDistro/yoe/mutOtavio Salvador2022-02-121-0/+3
|\ | | | | imx-g2d-samples: Ping to imxgpu2d machines
| * imx-g2d-samples: Ping to imxgpu2d machinesKhem Raj2022-02-121-0/+3
|/ | | | | | | It depends on imx-gpu-g2d recipe which is specific to imxgpu2d machine types Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Merge pull request #976 from sean-anderson-seco/crconfOtavio Salvador2022-02-111-3/+1
|\ | | | | Fix building crconf with usrmerge
| * crconf: Don't set FILESSean Anderson2022-02-111-2/+0
| | | | | | | | | | | | | | | | Documentation should be installed in the documentation package, not the main package. The latter two directories are already added to FILES by meta/conf/bitbake.conf. Signed-off-by: Sean Anderson <sean.anderson@seco.com>
| * crconf: Set SBINDIR and MANDIRSean Anderson2022-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | The default values of these variables are not appropriate when using usrmerge. This fixes the following error: ERROR: crconf-git-r0 do_package: QA Issue: crconf: Files/directories were installed but not shipped in any package: /sbin/crconf Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. Signed-off-by: Sean Anderson <sean.anderson@seco.com>
* | Merge pull request #977 from thochstein/masterOtavio Salvador2022-02-111-0/+1
|\ \ | | | | | | weston-init: Set bindir properly in weston.ini
| * | weston-init: Set bindir properly in weston.iniTom Hochstein2022-02-111-0/+1
|/ / | | | | | | | | | | | | The customized weston.ini is installed in the rootfs with an unresolved bindir variable. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>