summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1033 from niebelm/qoriq-weak-wks-defaultOtavio Salvador2022-04-051-1/+1
|\ | | | | qoriq-base: weak defaults for WKS_FILE
| * qoriq-base: weak defaults for WKS_FILEMarkus Niebel2022-04-051-1/+1
|/ | | | | | | | | | When maintaining a hardware support layer for a SOM there will be different mainboards and BSP for this SOM. Depending on the use case there may be different needs for SD / e-MMC images. When providing a valid weak default in meta-freescale a machine definition can override this easier as well a BSP for a specific mainboard. Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
* Merge pull request #1032 from thochstein/masterOtavio Salvador2022-04-0431-590/+647
|\ | | | | gstreamer: Upgrade 1.18.0.imx -> 1.18.5.imx
| * ffmpeg: Downgrade ffmpeg 5.0.0 -> 4.4.1 for NXP BSPTom Hochstein2022-04-043-0/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX 1.18.5 version of gstreamer1.0-libav is not compatible with upstream ffmpeg 5.5.0 and results in the follow build errors: ``` /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavaudenc.c.o: in function `gst_ffmpegaudenc_set_format': /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:246: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:292: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:336: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:317: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavaudenc.c.o: in function `gst_ffmpegaudenc_start': /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:197: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavvidenc.c.o:/usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavvidenc.c:252: more undefined references to `avcodec_get_context_defaults3' follow collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * imx-gst1.0-plugin: Adjust libdrm dependencyTom Hochstein2022-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 7ULP build is broken: ``` ../git/plugins/compositor/gstimxcompositor.c:124:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 124 | #include <libdrm/drm_fourcc.h> | ^~~~~~~~~~~~~~~~~~~~~ ``` Replace the imxvpu condition for the libdrm dependency to all fbdev devices with GPU. For i.MX 6 and 7, the new condition simply extends what the old condition provided. For i.MX 8, the new condition removes the explicit dependency. It seems the dependency is still needed, but it is satisfied implicitly. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * imx-base.inc: Upgrade gstreamer1.0 1.18.0 -> 1.18.5Tom Hochstein2022-04-041-7/+7
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * imx-gst1.0-plugin: Upgrade 4.6.1 -> 4.6.4Tom Hochstein2022-04-041-7/+4
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-rtsp-server: Upgrade 1.18.0 -> 1.18.5Tom Hochstein2022-04-041-4/+5
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-rtsp-server: Remove unused patch fileTom Hochstein2022-04-041-36/+0
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-libav: Upgrade 1.18.0 -> 1.18.5Tom Hochstein2022-04-041-1/+1
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-libav: Remove unused patch filesTom Hochstein2022-04-045-162/+0
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-plugins-ugly: Upgrade 1.18.0 -> 1.18.5Tom Hochstein2022-04-041-1/+1
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-plugins-bad: Upgrade 1.18.0.imx -> 1.18.5.imxTom Hochstein2022-04-0410-244/+151
| | | | | | | | | | | | | | Also separate the base recipe copy from the overrides for ease of maintenance. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-plugins-good: Upgrade 1.18.0.imx -> 1.18.5.imxTom Hochstein2022-04-042-15/+105
| | | | | | | | | | | | | | Also separate the base recipe copy from the overrides for ease of maintenance. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0-plugins-base: Upgrade 1.18.0.imx -> 1.18.5.imxTom Hochstein2022-04-044-94/+53
| | | | | | | | | | | | | | Also separate the base recipe copy from the overrides for ease of maintenance. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * gstreamer1.0: Upgrade 1.18.0.imx -> 1.18.5.imxTom Hochstein2022-04-042-18/+35
|/ | | | | | | Also separate the base recipe copy from the overrides for ease of maintenance. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #1028 from thochstein/masterOtavio Salvador2022-04-0110-22/+32
|\ | | | | Fix mx8dx machine override hierarchy
| * imx-base.inc: Fix MACHINE_SOCARCH_SUFFIX for 8XLiteTom Hochstein2022-03-311-1/+1
| | | | | | | | | | | | | | The architecture is independent of the number of cores, so update the 8XLite suffix from mx8dxl to mx8xl. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * mx8dx: Normalize MACHINEOVERRIDES implementationTom Hochstein2022-03-3110-21/+31
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | The imx8dx-mek machine is similar to imx8qxp-mek and so the mx8qxp override was included in the MACHINEOVERRIDES hierarchy. This is non-standard, and the rework of the SOC overrides didn't handle it properly, leading to a build break: ``` Log data follows: | DEBUG: Executing shell function do_compile | NOTE: 8QX boot binary build | cp: failed to access '/home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin': Not a directory | WARNING: /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636:179 exit 1 from 'cp /home/aquino/src/ossystems/oel-platform/build/tmp/deploy/images/imx8dx-mek/imx-boot$ tools/scfw_tcm.bin /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin' | WARNING: Backtrace (BB generated script): | #1: compile_mx8x, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 179 | #2: do_compile, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 151 | #3: main, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 189 ERROR: Task (/home/aquino/src/ossystems/oel-platform/sources/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_1.0.bb:do_compile) failed with exit code '1' ``` Fix the problem by removing mx8qxp from the mx8dx hierarchy and adapting existing mx8qxp overrides appropriately. Fixes: #1027 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #1024 from niebelm/qoriq-weak-defaultsOtavio Salvador2022-03-311-3/+3
|\ | | | | qoriq-base: weak defaults for u-boot/bootloader/kernel PREFERRED_PROVIDER
| * qoriq-base: weak defaults for u-boot/bootloader/kernel PREFERRED_PROVIDERMarkus Niebel2022-03-311-3/+3
|/ | | | | | | | When using a kernel/bootloader fork maintained by board vendor and there are somer flavours ist would be good to have only weak assignments here. This enables to override the default by machine config and set final by distro or local.conf. Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
* Merge pull request #1023 from dv1/masterOtavio Salvador2022-03-302-54/+65
|\ | | | | libimxdmabuffer: Upgrade to version 1.1.0
| * libimxdmabuffer: Upgrade to version 1.1.0Carlos Rafael Giani2022-03-302-54/+65
|/ | | | | | | | | | | | * Add dma-heap allocator * Documentation and typo fixes * Use RW flags in ION allocator if no mapping flags are specified * Add checks for attempts to map already mapped buffers with different flags than in the original mapping Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
* Merge pull request #1017 from MrCry0/master-imx6ulOtavio Salvador2022-03-292-2/+0
|\ | | | | Fix: master: imx6ul*: remove obsolete device tree entry
| * imx6ul*: remove obsolete device tree entryOleksandr Suvorov2022-03-292-2/+0
|/ | | | | | | | | | | | The imx6ul-14x14-evk-btwifi-oob.dtb and imx6ull-14x14-evk-btwifi-oob.dtb are no longer available in the kernel lf-5.10.y, it was removed in a1488e98156ea1a597353c93b76b4f7fd8dd7c7c Remove entries for non-existent dtb files. This fixes building a Linux kernel recipe for imx6ulevk/imx6ullevk. Fixes: 3f93c925 ("linux-imx*: Upgrade to 5.10.52") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
* Merge pull request #1016 from MaxKrummenacher/masterOtavio Salvador2022-03-251-140/+0
|\ | | | | libdrm: remove unused patch
| * libdrm: remove unused patchMax Krummenacher2022-03-251-140/+0
|/ | | | | | | With the update to 2.4.109.imx the patch is no longer needed. Also remove it from the layer. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* Merge pull request #1015 from thochstein/masterOtavio Salvador2022-03-253-13/+18
|\ | | | | Upgrade libdrm and wayland-protocols to fix mesa compatibility issue
| * wayland-protocols: Upgrade 1.22.imx -> 1.25.imxTom Hochstein2022-03-252-6/+12
| | | | | | | | | | | | | | | | This is a pre-release version from upcoming NXP Q2 release added to kirkstone to fix mesa compatibility problems. The commit does also update the recipe to align with the one in OE-core. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * libdrm: Upgrade 2.4.207.imx -> 2.4.109.imxTom Hochstein2022-03-252-7/+6
|/ | | | | | | | | This is a pre-release version from upcoming NXP Q2 release added to kirkstone to fix mesa compatibility problems. The patch 0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch is dropped as it is now upstream. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #1014 from thochstein/masterOtavio Salvador2022-03-222-2/+3
|\ | | | | mfgtool-initramfs-image: Switch to zstd compression
| * kernel-itbimage: Add support for cpio.zstdTom Hochstein2022-03-221-1/+1
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * mfgtool-initramfs-image: Switch to zstd compressionTom Hochstein2022-03-221-1/+2
|/ | | | | | | The initramfs memory size is limited, so use zstd compression level 10 to cut the cpio archive size by some 30%. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #1012 from thochstein/masterOtavio Salvador2022-03-201-1/+1
|\ | | | | imx-base.inc: Enable Crypto for all 8X
| * imx-base.inc: Enable Crypto for all 8XTom Hochstein2022-03-201-1/+1
|/ | | | | | Align with 8M family. Enabling Crypto enables FP and SIMD as well. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #1010 from thochstein/soc-overridesOtavio Salvador2022-03-163-19/+20
|\ | | | | Fix SOC override priority change and adjust imx-alsa-plugins version handling
| * imx-base.inc: Decrease machine feature override priorityTom Hochstein2022-03-161-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new SOC overrides changed the priority for the NXP machine feature overrides (like imxgpu2d) to be higher than the SOC override (like mx8qxp). This change manifested as a change to the weston-init configuration for mx8qxp and mx8qm, causing the addition of -use-g2d=1 to the weston runtime configuration file weston.ini. The problem is fixed simply by moving the feature overrides before the SOC overrides to match the old priority order. However, to provide consistency, rather than just match the old priority order, the features are now moved lower in priority than any of the SOC group overrides as well (like mx8 and mx8x). Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * Revert "weston-init: fix some invalid overrides"Tom Hochstein2022-03-151-2/+2
| | | | | | | | | | | | There is a root cause to this that will be fixed instead. This reverts commit 6be9870b5057cf122cecb2716583169b39de78ae.
| * imx-alsa-plugins: Set recipe name and PV properlyTom Hochstein2022-03-151-0/+1
| | | | | | | | | | | | | | The recipe allows SRCREV to change while the version stays at 1.0.26, so change the recipe version to git and set PV based on the SRCREV. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | Merge pull request #1001 from thochstein/masterOtavio Salvador2022-03-152-0/+30
|\ \ | |/ |/| optee-os: Fix RPMB build break
| * optee-os: Fix RPMB build breakTom Hochstein2022-03-072-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CFG_RPMB_FS=y, OP-TEE os no longer compiles because imx_rpmb.c tries to include a header that doesn't exist. This issue seems linked to a rework that allows to compile i.MX Secure Non-Volatile Storage driver without RPMB. ``` | CC optee-os/3.15.0.imx-r0/build/core/arch/arm/plat-imx/imx_rpmb.o | core/arch/arm/plat-imx/imx_rpmb.c:5:10: fatal error: drivers/imx_snvs.h: No such file or directory | 5 | #include <drivers/imx_snvs.h> | | ^~~~~~~~~~~~~~~~~~~~ | compilation terminated. | make: *** [mk/compile.mk:159: optee-os/3.15.0.imx-r0/build/core/arch/arm/plat-imx/imx_rpmb.o] Error 1 | make: *** Waiting for unfinished jobs.... | CC optee-os/3.15.0.imx-r0/build/core/crypto/crypto.o | CC optee-os/3.15.0.imx-r0/build/core/arch/arm/plat-imx/imx_dt.o | make: Leaving directory 'optee-os/3.15.0.imx-r0/git' | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. ERROR: Task (optee-imx/optee-os_3.15.0.imx.bb:do_compile) failed with exit code '1' ``` This is fixed in the upcoming release NXP 5.15.5-1.0.0. Backport the patch. Fixes: #997 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | Merge pull request #1007 from liuming50/fix-a-invalide-overrides-usageOtavio Salvador2022-03-131-2/+2
|\ \ | | | | | | weston-init: fix some invalid overrides
| * | weston-init: fix some invalid overridesMing Liu2022-03-131-2/+2
|/ / | | | | | | | | | | | | | | | | | | The mx8qm-nxp-bsp/mx8qxp-nxp-bsp overrides would not work because imxgpu2d would take effect in the end since it has higher priority in MACHINEOVERRIDES. Append mx8qm-nxp-bsp/mx8qxp-nxp-bsp after imxgpu2d can fix the problem. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
* | Merge pull request #1003 from chrisdimich/masterOtavio Salvador2022-03-082-105/+8
|\ \ | | | | | | isp-imx: start_isp.sh: fix NR_DEVICE_TREE_BASLER variable
| * | isp-imx: start_isp.sh: fix NR_DEVICE_TREE_BASLER variableChris Dimich2022-03-082-105/+8
|/ / | | | | | | The NR_DEVICE_TREE_BASLER variable has the wrong path.
* | Merge pull request #1000 from zandrey/topic/cleanup-atf-address-variableOtavio Salvador2022-03-075-11/+0
|\ \ | | | | | | Clean-up obsolete ATF load address for i.MX8M machines
| * | conf: machine: imx8m*: clean-up obsolete ATF load addressAndrey Zhizhikin2022-03-075-11/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Upstream U-Boot commit d9a6f0eed66a ("tree: imx: remove old fit generator script") dropped the FIT generator script, which was using environment variable setting the ATF load address into the FIT ITS file. This has been replaced by binman node description, where ATF address is defined, hence the enviroment variable is not required anymore. Clean-up the layer's class and machine description to remove the variable, which is not used anymore. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* | Merge pull request #999 from twoerner/contrib/twoerner/imxbase-mxsOtavio Salvador2022-03-071-2/+3
|\ \ | |/ |/| imx-base.inc: add back mxs/mx23 support
| * imx-base.inc: add back mx23 supportTrevor Woerner2022-03-071-2/+3
|/ | | | | | | | | | When include/imx-base.inc was simplified to use the imx-{mainline,nxp}-bsp overrides, the "mx23" category of machines was missed. Build tested with imx233-olinuxino-* and imx23evk. Run tested with imx233-olinuxino-maxi. Signed-off-by: Trevor Woerner <twoerner@gmail.com>
* Merge pull request #998 from MaxKrummenacher/masterOtavio Salvador2022-03-065-114/+4
|\ | | | | drop vivante specific x11 driver & opencv: follow oe-core's variable name changes