summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* isp-imx: fix configure errorMax Krummenacher2021-11-021-1/+2
| | | | | | | | | Fixes commit ec31e767 ("isp-imx: upgrade to 4.2.2.15.0") | CMake Error at CMakeLists.txt:86 (message): | -DSDKTARGETSYSROOT=... missing from cmake call Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* isp-imx: refresh patchMax Krummenacher2021-11-021-15/+15
| | | | | | | | | | | | | | | | | Refresh patch after version bump. Fixes commit ec31e767 ("isp-imx: upgrade to 4.2.2.15.0") | ERROR: isp-imx-4.2.2.15.0-r0 do_patch: Applying patch '0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch' on target directory '.../isp-imx/4.2.2.15.0-r0/isp-imx-4.2.2.15.0' | CmdError('quilt --quiltrc .../isp-imx/4.2.2.15.0-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch | patching file mediacontrol/CMakeLists.txt | patching file mediacontrol/daemon/main_v4l2.cpp | Hunk #1 FAILED at 96. | Hunk #2 FAILED at 105. | Hunk #3 FAILED at 123. | 3 out of 3 hunks FAILED -- rejects in file mediacontrol/daemon/main_v4l2.cpp | Patch 0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch does not apply (enforce with -f) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* Merge pull request #907 from thochstein/masterOtavio Salvador2021-11-011-9/+11
|\ | | | | imx-gpu-viv updates for 6.4.3.p2.2
| * imx-gpu-viv: Install SOC-specific binariesTom Hochstein2021-10-311-0/+11
| | | | | | | | | | | | The archive now contains SOC-specific binaries. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * imx-gpu-viv: Drop SOC-specific header installationTom Hochstein2021-10-311-9/+0
| | | | | | | | | | | | | | The recipe installs GLES3 headers based on SOC. This is not necessary as lack of support is expected to be handled at runtime. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | Merge pull request #908 from thochstein/vulkanOtavio Salvador2021-11-011-2/+5
|\ \ | | | | | | imx-gpu-viv: Expose Vulkan library version
| * | imx-gpu-viv: Expose Vulkan library versionTom Hochstein2021-10-311-2/+5
| |/ | | | | | | | | | | | | Expose the Vulkan library version so NXP can easily override in their layer. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | Merge pull request #909 from sapiippo/masterOtavio Salvador2021-11-011-1/+0
|\ \ | |/ |/| imx8qm-mek: remove obsolete dtb
| * imx8qm-mek: remove obsolete dtbSamuli Piippo2021-11-011-1/+0
|/ | | | | | | imx8qm-mek-dsp.dtb is no longer available in the kernel, it was removed in de78ae45bfffed2c9490ab733d11ebab2672984d Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge pull request #905 from MaxKrummenacher/masterOtavio Salvador2021-10-311-0/+3
|\ | | | | imx-lib: fix packaging
| * imx-lib: fix packagingMax Krummenacher2021-10-311-0/+3
|/ | | | | | | | | | Fixes commit 87cb0d99 ("imx-lib: upgrade to 5.10.52_2.1.0") | ERROR: imx-lib-1_5.9+AUTOINC+87ddd80953-r0 do_package: QA Issue: imx-lib: Files/directories were installed but not shipped in any package: | /usr/lib/libcec.go | /usr/lib/libipu.go Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* Merge pull request #904 from YoeDistro/yoe/mutOtavio Salvador2021-10-291-10/+6
|\ | | | | waffle: Forward port Separate-surfaceless-option-from-x11 patch as well
| * waffle: Forward port Separate-surfaceless-option-from-x11 patch as wellKhem Raj2021-10-291-10/+6
|/ | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Merge pull request #903 from YoeDistro/yoe/mutOtavio Salvador2021-10-291-15/+13
|\ | | | | waffle: Forward port the patch to latest waffle
| * waffle: Forward port the patch to latest waffleKhem Raj2021-10-291-15/+13
|/ | | | | | OE-core has new version Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Merge pull request #896 from zandrey/upgrade-to-nxp-5.10.52-2.1.0Otavio Salvador2021-10-2533-484/+434
|\ | | | | Upgrade to NXP Release: 5.10.52-2.1.0
| * imx-vpuwrap: upgrade to 4.6.2Andrey Zhizhikin2021-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commits are included in this update: ---- f09ceba ("Update EULA.txt to v27 according to imx-release-info") 60b5950 ("Update EULA.txt to v25 according to imx-release-info") 8dce1b6 ("Update EULA.txt to v24 according to imx-release-info") c278d0d ("Update EULA.txt to v23 according to imx-release-info") 42da611 ("[configurea.ac] Update version to 4.6.2 for next release") 761c323 ("MMFMWK-8940 Force inserted I frame to be IDR frame.") bf01b8f ("Update EULA.txt to v19 according to imx-release-info") 9d05c1d ("Update EULA.txt to v18 according to imx-release-info") f84384e ("MA-18641 Fix vp8 encoder bitrate incorrect") 0594603 ("LF-3164 Fix segmentation fault when seeking one RV clip") fb11efe ("MMFMWK-8922 [8mp]Force one frame to be key frame with parameter nForceIPicture") 735d02d ("MMFMWK-8926 [hantro] disable adaptive mode") 7e94957 ("[configurea.ac] Update version to 4.6.1 for next release") 806fe7e ("Revert "MMFMWK-8922 [8mp]Force one frame to be key frame with parameter nForceIPicture"") eb4b209 ("MMFMWK-8922 [8mp]Force one frame to be key frame with parameter nForceIPicture") 13e9e78 ("MMFMWK-8816 vpuenc: add VBR mode for 8mm/8mp") b931875 ("[configurea.ac] Update version to 4.6.0 for next release") ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-parser: upgrade to 4.6.2Andrey Zhizhikin2021-10-221-3/+3
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-codec: upgrade to 4.6.2Andrey Zhizhikin2021-10-221-3/+3
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * kernel-module-isp-vvcam: upgrade to 4.2.2.15.0Andrey Zhizhikin2021-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | Following commits are included in this upgrade: ---- 47588cb ("fix run isp with gpu system hang") 4cba67a ("fix M865SW-752:dual basler ISP no output after run resolution switch") f1d6fd1 ("fix M865SW-752:ISP no output after run resolution switch") ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * kernel-module-imx-gpu-viv: upgrade to 6.4.3.p2.2Andrey Zhizhikin2021-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commits are included in this upgrade: ---- 9ed88c24c073 ("MGS-6364 [#imx-2637] mmuException enable on non-linux platform") 8f6ef7cf0a71 ("MGS-6371 [#imx-2489] Fixed the gckHARDWARE_SetFscaleValue().") 735750cefe9d ("MGS-6371 [#imx-2489] Remove gckHARDWARE_QueryIdleUnlocked().") 354c4e8d79e2 ("MGS-6371 [#imx-2489] weston crash with GPU frequency scaling test") dadbb5268b73 ("MGS-6364 [#imx-2637] add module parameters mmuException") 8f7fdea4e240 ("MGS-6362 [#imx-2636] set default GPU configuration to zero") d21f3ff502d5 ("MGS-6371 [#imx-2489] weston crash with GPU frequency scaling test") 1eb60a4b6838 ("MGS-6351 [#ccc] 0009-KERNEL-SPACE-Update-gc_feature_database.h-to-370970") c7a04ba13513 ("MGS-6351 [#ccc] 0121-KERNEL-SPACE-Update-gc_feature_database.h-to-369123") ec2a94061dda ("MGS-6351 [#ccc] 0110-IMX-2489-CL369042-KERNEL-SPACE-Merge-NXP-IMX-2489-ke") 08477c5a69ec ("MGS-6351 [#ccc] 0092-CL368512-KERNEL-SPACE-dev64x-refine-cl368499-and-fix") ec41c4fe7b8b ("MGS-6351 [#ccc] 0090-CL368499-KERNEL-SPACE-234062-add-a-function-of-recvo") dc0b2a07f249 ("MGS-6351 [#ccc] 0026-CL366927-USER-SPACE-TOT-v620_v1-v620_v3-v602-v630-v6") feaad9ebe1bb ("MGS-6351 [#ccc] 0025-CL366927-KERNEL-SPACE-TOT-v620_v1-v620_v3-v602-v630-") 96463f29ce93 ("MGS-6351 [#ccc] 0023-CL366921-KERNEL-SPACE-dev64x_234062-merge-the-gckOS_") efab5fbf64df ("MGS-6351 [#ccc] 0018-BUG30402-CL366610-KERNEL-SPACE-Fixed-an-incorrect-te") 4a10ab6a33b6 ("MGS-6351 [#ccc] 0014-CL366436-KERNEL-SPACE-dev64x_234062-Fix-IMX-2546-Goo") 4493c17d2bbf ("MGS-6351 [#ccc] 0001-CL363038-KERNEL-SPACE-dev64x_234062-there-is-no-cach") ff2c809a524a ("MGS-6306 [#ccc] 0053-CL31052-KERNEL-SPACE-reg-Fix-Compile-error-introduc") 80d71ff684f4 ("MGS-6306 [#ccc] 0051-CL361048-KERNEL-SPACE-v620_v2-Cmodel.-Update-comment") 07f6e6fa3f43 ("MGS-6306 [#ccc] 0076-KERNEL-SPACE-Update-gc_feature_database.h-to-362025") 02cf78d3631d ("MGS-6306 [#ccc] 0032-CL359036-KERNEL-SPACE-6.4.x_234062-Fix-build-error-c") ae684e674d97 ("MGS-6306 [#ccc] 0024-IMX-2496-CL358735-KERNEL-SPACE-projects.dev_234062-I") 01cf89ac3288 ("MGS-6306 [#ccc] 0022-CL358626-KERNEL-SPACE-6.4.x_234062-Fix-build-error-o") ecf41b2c3a30 ("MGS-6306 [#ccc] 0004-CL354396-KERNEL-SPACE-dev64x_234062-elminate-the-err") db7fa04f3a0b ("MGS-6306 [#ccc] 0001-BUG29959-CL354178-KERNEL-SPACE-6.4.x-6.4.x_234062-bu") 208e6ba3a8d1 ("MGS-6198 [#imx-2599] [QNX] Support SDP7.1") f6a3d08effc1 ("MGS-6198-1 [#imx-2599] [QNX] Support SDP7.1") d3d40dd76128 ("MGS-6108 [#imx-2416] Fix OpenCL-CTS test_buffer fail issue.") 13901d97f8bf ("LF-3886 [#imx-2532] Coverity Issue:15625673 Uninitialized scalar variable") 6e4162a25596 ("MGS-6273 [#ccc] 0086-KERNEL-SPACE-Update-gc_feature_database.h-to-352906") 003dab464794 ("MGS-6273 [#ccc] 0032-IMX-2523-CL351165-KERNEL-SPACE-64x_234062-merge-the-") 264114da7d27 ("MGS-6273 [#ccc] 0001-BUG28459-CL346090-KERNEL-SPACE-nxp234062-merge-CL344") a619545d39e0 ("MGS-6186 [#imx-2493] AtomSetMask for event pending when recovery") a2abff86c9f7 ("MGS-6186 [#imx-2493] disable pm when recovery") 7a8a28770b85 ("MGS-6197 [#imx-2532] fix compile error when DEBUG enable") ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-gpu-g2d: upgrade to 6.4.3.p2.2Andrey Zhizhikin2021-10-221-5/+5
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-dpu-g2d: upgrade to 1.9.4Andrey Zhizhikin2021-10-221-4/+4
| | | | | | | | | | | | Add runtime dependency to libopencl-imx. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-gpu-viv: upgrade to 6.4.3.p2.2Andrey Zhizhikin2021-10-224-9/+9
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * isp-imx: upgrade to 4.2.2.15.0Andrey Zhizhikin2021-10-222-7/+7
| | | | | | | | | | | | | | Upgrade both isp-imx and basler-camera packages to revision 4.2.2.15.0, which is included in NXP release 5.10.52-2.1.0. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-vpu-hantro[-vc]: upgrade to 5.10.52-2.1.0Andrey Zhizhikin2021-10-224-42/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Hantro VPU libraries are upgraded to following versions in the NXP release 5.10.52-2.1.0: - imx-vpu-hantro: 1.23.0 - imx-vpu-hantro-daemon: 1.1.0 - imx-vpu-hantro-vc: 1.5.0 Drop patch from imx-vpu-hantro-daemon package build as it has been applied upstream and is present in the updated version. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-gpu-viv: skip QA check for libgl-imx packageAndrey Zhizhikin2021-10-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | libgl-imx package provides libGL, which has runtime dependencies on X11 libraries. In case of Wayland-only builds, this triggers the QA error on missing RDEPENDS, since they are not provided by any package. Skip this QA check for libgl-imx package, as it is not distributed for Wayland-only builds, and has dependencies properly resolved when X11 builds are used. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-test: upgrade to 5.10.52_2.1.0Andrey Zhizhikin2021-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Following commits are included in this upgrade: ---- 2dcb987 ("MLK-25647-2 mxc_v4l2_vpu_test: expand the conversion function") 2b63cde ("MLK-25647 mxc_v4l2_vpu_test: expand the conversion function") f078eac ("unit_test: mxc_v4l2_test: add camera test support for iMX8ULP") afa5afe ("MLK-25487-2:mxc_v4l2_vpu_test: improve mpeg4 parser") 703ed09 ("MLK-25487:mxc_v4l2_vpu_test: Implement a simple seek function in unit test") ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-seco: upgrade to 3.8.2Andrey Zhizhikin2021-10-221-3/+3
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-mkimage: use mkimage tool from sysrootAndrey Zhizhikin2021-10-223-3/+84
| | | | | | | | | | | | | | | | | | | | | | mkimage tool is provided as a part of sysroot and should not be used as a local copy, since it contains runtime dependencies which local copy does not account for. Drop the local copy on mkimage, introduce the patch that fixes mkimage invocations in build system. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-mkimage: update to 5.10.52-2.1.0Andrey Zhizhikin2021-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commits are included in this update: ---- 1112c88 ("MLK-25706: iMX8M: soc: fix support to override u-boot DTB file name") 5af389c ("iMX8ULP: support xip for m33 and add README") 37faca4 ("MLK-25490 imx8m: Remove unused DDR registers file") 4e241ae ("iMX8M: Support to override u-boot DTB file name") 7e5ff11 ("imx8ulp: Workaround ATXP flash header for dual boot") 394188b ("Support iMX8ULP secure boot") 32bf25f ("imx8ulp: Add flash_dualboot_m33 to generate M33 container") aa44b32 ("imx8ulp: Move M33 image before AP image for single boot") ad70dd2 ("imx8qm: cockpit: fix Linux image name in nightly targets") ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-lib: upgrade to 5.10.52_2.1.0Andrey Zhizhikin2021-10-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update branch, SRCREV and PV to point to new version, add support for mx8ulp. Following commits are included in this revision: ---- 87ddd80 ("lib: pxp: add DMABUF support for pxp lib") 7fc4448 ("lib: pxp: remove unsigned long force type conversion") 5ac2f74 ("lib: pxp: Makefile: Add iMX8ULP platform support") d09fbbc ("MA-15553-1 Amend Cflag & Cppflag in go file") 026eefc ("MA-15263-3 convert Android.mk to Android.bp") fcf9171 ("MA-14403 Bring imx6/7 soc on q-preview (LOCAL_MODULE_TAGS)") ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * firmware-sof-imx: upgrade to 1.9.0-1Andrey Zhizhikin2021-10-221-2/+2
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-sc-firmware: upgrade to 1.10.0Andrey Zhizhikin2021-10-221-3/+3
| | | | | | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * imx-atf: upgrade to lf-5.10.52-2.1.0Andrey Zhizhikin2021-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade ATF from NXP fork to [lf-5.10.52-2.1.0] tag. Following commits are included in this upgrade: ---- bb4957067 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 071ce9ad8 plat: ls1046aqds/ls1088aqds: fix compile issue 444006957 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 a0373a8b0 LF-4542 plat: imx8ulp: Config APD power mode info before entring low power mode 7fe0a68d6 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 562dfcd6c LF-4541 plat: imx8m: Fix coverity issue caused by unnecessary header file 6b8cf1e4f Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 b855d406f plat: nxp-ls2088a: fix coverity issue 670e6a61d plat: nxp-ls1043a: fix coverity issue b5ac4e036 plat: nxp-lx216x: fix coverity issue 8b5f61577 plat: nxp-ls1088a: fix coverity issue 956b2bc49 plat: nxp-ls1046a: fix coverity issue 105f60377 plat: nxp-ls1028a: fix coverity issue e66ddaee5 plat: nxp-ls1012a: fix coverity issue 63b623059 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 b6a03753b plat: nxp-lx2160ardb: fix coverity issue f10ff34cc plat: nxp-ls2088aqds: fix coverity issue d6eacdcfe plat: nxp-ls1012afrwy: fix coverity issue 1d6272b4e driver: nxp-ddr: fix coverity issue 8b0e91bf0 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 c759ee5fe plat: nxp-lx2162aqds: fix coverity issue 1feec9e9f driver: nxp-flexspi-nor: fix coverity issue d7da0f975 driver: nxp-caam: fix coverity issue c2e4243e1 driver: nxp-sd: fix coverity issue e3627d603 driver: nxp-i2c: fix coverity issue 94b0db881 nxp-common: fix coverity issue 7229a68ea driver: nxp-ddr: fix coverity issue 8a7411005 nxp-common: fix coverity issue a0d3e742f driver: nxp-cci: fix coverity issue ffe86fe5e driver: nxp-ddr: fix coverity issue 291bbd72b nxp-tools: fix coverity issue 5e62baea1 nxp-tools: fix coverity issue 6708ca50f LF-4510-02 plat: imx8m: Fix Coverity issues 8012fd121 LF-4510-01 plat: imx: fix coverity issue b453d03af Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 d0f37c58f nxp: lx2162aqds: fix coverity issue 01c206810 nxp: ls1088a: fix coverity issue 6b21cf9e0 nxp: ls1088ardb: fix coverity issue 29d1246a8 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 fcc603f23 LF-4263 plat: imx8ulp: Update the copyright format of upower api 941c36b5a nxp: layerscape: fix copyright description e2a9f40c0 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 d2f5d9c5f Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 05900f5a3 Setup DID for CAAM job rings allocated for the non secure world. bc71161d0 Setup DID for CAAM job rings allocated for the non secure world. c1c240467 plat: imx8ulp: init scmi agent b005557bc plat: imx8ulp: init scmi agent eecdafb98 MA-19048-2 MCU security enhancement 811da202c MA-19071 imx8mn: workaround for errata ERR050362 32f8832e8 MA-19048-2 MCU security enhancement 9a2deca88 MA-19071 imx8mn: workaround for errata ERR050362 b88853df1 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 d596343e1 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 68fb4bc35 LF-4197 plat: imx8mp: update the csu csl index on imx8mp 32e8f05e5 LF-4198 plat: imx8m: Fix the potential array overflow 500f5203f Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 03fe6dec1 MA-19291 imx8mn/imx8mp: Lock ocram secure access 2acdf5212 MLK-25661 plat: imx8ulp: temp workaround for the hifi4 & dsi power domain dependency 230e2ea73 LF-4023 plat: imx8mp: Add back the idx define for csu/rdc 817bcccbe Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 0d1230cf9 ddr: phy-gen2: Enable quick vref training during 1D training 5e6d83ef9 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 463772b81 plat: layerscape: fix global data not initialized issue e27c1370c Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 0e1180ef9 drivers/nxp/ddr: Corrects variable type for i in parse_odt 29ef0aae2 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 6fdf0285e ddr: phy-gen2: Add workaround for Errata A050958 61516b759 Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 65b2301c7 MA-19209 imx8ulp: add trusty support 8f6d3b9ba Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 375b5ef20 MLK-25624 imx8ulp: upower_hal: fix upower_wait_resp 6ce7ba508 MLK-25605 plat: imx8ulp: Add the basic support for idle & system suspned f650cccac MLK-25575-7 imx8ulp: add scmi power domain support 2c85c48cf MLK-25575-6 imx8ulp: remove legacy scmi e9071cbd7 MLK-25575-5 scmi-msg: entry: add weak functions a0c780d88 MLK-25575-4 scmi-msg: add power domain protocol ff9455ce9 MLK-25575-3 scmi-msg: smt: fix build for aarch64 842c98836 MLK-25575-2 imx8ulp: upower: misc cleanup 0cc48db7e MLK-25575-1 plat: imx8ulp: sync upower API to powersys_fw_048.011.012.006 fbd29645c drivers: move scmi-msg out of st 00d5d86bc LFOPTEE-48 imx8ulp: add OPTEE support d41aa5f8c MLK-25581: plat: imx8ulp: Remove print for hifi configuration 08b7e9a55 plat: imx8ulp: configure xrdc for hifi in LPAV 3258532c3 plat: imx8ulp: Enable DMA2->DDR read/write ddee73631 plat: imx8ulp: Add the rdc config for sai/spdif 7bd4b80df plat: imx8ulp: Add the initial XRDC support 73b148648 plat: imx8ulp: Add the basic scmi sensor support eb96f940f plat: imx8ulp: Add the basic scmi perf support 4d90d2d62 plat: imx8ulp: Add initial scmi upower pd support e45ddab4b plat: imx: Add i.MX8ULP basic support 2b733dc28 Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 de08b8b5d Merge remote-tracking branch 'origin/imx_v2.4' into lf_v2.4 a83a7c65e TEE-639 plat: imx8m: Do not release JR0 to NS if HAB is using it 2420d75bf nxp: lx2: fix getting cluster number b2868d255 driver: ddr-phy: fix coverity issue 884f60c3d driver: caam: fix coverity issue 7fb157e12 nxp: ls2088a: fix getting cluster number 3d2e8b90e Merge remote-tracking branch 'origin/ls_v2.4' into lf_v2.4 e1feab395 LSXXXX/ddr - Add Rawcard 1F support ---- Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * firmware-imx: upgrade to 8.13Andrey Zhizhikin2021-10-224-3/+3
| | | | | | | | | | | | | | New firmware binaries are available from NXP as a part of 5.10.52-2.1.0 release. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * Update EULA and SCR for NXP release 5.10.52-2.1.0Andrey Zhizhikin2021-10-223-382/+279
|/ | | | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* Merge pull request #895 from ting-liu/masterOtavio Salvador2021-10-214-694/+0
|\ | | | | openssl-qoriq: remove bbappend and patches
| * openssl-qoriq: remove bbappend and patchesTing Liu2021-10-214-694/+0
|/ | | | | | | As oe-core upgrades openssl to 3.0.0, the two patches don't apply any more. Currenly no plan to port them for 3.0.0. Remove to not break build. Signed-off-by: Ting Liu <ting.liu@nxp.com>
* Merge pull request #894 from hongxu-jia/masterOtavio Salvador2021-10-215-6/+38
|\ | | | | support user merge
| * odp-module/odp-counters/kernel-module-ar: fix QA Issue during usermergeHongxu Jia2021-10-213-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While enabling usermerge, there is a QA issue: ... ERROR: odp-counters-git-r0 do_package: QA Issue: odp-counters: Files/directories were installed but not shipped in any package: /lib /lib/modules /lib/modules/5.10.70-yocto-standard /lib/modules/5.10.70-yocto-standard/odp /lib/modules/5.10.70-yocto-standard/odp/odpfsl_perfcounters.ko Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. odp-counters: 5 installed and not shipped files. [installed-vs-shipped] ... Use Yocto nonarch_base_libdir to replace hardcode /lib Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
| * dce: fix QA Issue during usermergeHongxu Jia2021-10-212-0/+32
|/ | | | | | | | | | | | | | While enabling usermerge, there is a QA issue: ... ERROR: dce-git-r0 do_package: QA Issue: dce: Files/directories were installed but not shipped in any package: /sbin/dce-api-perf-test /sbin/dce-example Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. ... Use Yocto base_sbindir to replace hardcode ./sbin Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
* Merge pull request #892 from YoeDistro/yoe/mutOtavio Salvador2021-10-201-0/+2
|\ | | | | uuu: Limit target recipe to to imx machines
| * uuu: Limit target recipe to to imx machinesKhem Raj2021-10-201-0/+2
|/ | | | | | uuu is not used in other SOCs Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Merge pull request #891 from Ossanes/topic/drop-mx25pdkOtavio Salvador2021-10-194-412/+0
|\ | | | | mx25pdk: Remove machine due to its deadline
| * mx25pdk: Remove machine due to its deadlineVinicius Aquino2021-10-194-412/+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 #890 from zandrey/kernel-update-masterOtavio Salvador2021-10-193-7/+20
|\ \ | |/ |/| Consolidated Kernel update (v5.10.74 + 5.14.13)
| * linux-fslc-imx: pick linux-fslc pr #466Andrey Zhizhikin2021-10-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Following upstream commits are included in this version: ---- 8b20421b2b61 staging: fsl_ppfe: reduce MAC address filtering loglevel to debug 16ea8f2ab906 staging: fsl_ppfe: assign correct OF nodes to individual ports 9d0f521803cd staging: fsl_ppfe: handle all RGMII modes in pfe_eth_adjust_link ---- Link: https://github.com/Freescale/linux-fslc/pull/466 Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * linux-fslc-imx: update to v5.10.74Andrey Zhizhikin2021-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel repository has been upgraded up to v5.10.74 from stable korg. Following upstream commits are included in this version: ---- 77434fe5a077 Linux 5.10.74 42b49f012b6a hwmon: (pmbus/ibm-cffps) max_power_out swap changes bb893f075431 sched: Always inline is_percpu_thread() bdae2a083436 perf/core: fix userpage->time_enabled of inactive events 57c7ca3d5592 scsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported" d993d1e1c411 scsi: ses: Fix unsigned comparison with less than zero 621ddffb70db drm/amdgpu: fix gart.bo pin_count leak a5ba615fbeb3 net: sun: SUNVNET_COMMON should depend on INET db868b45324d vboxfs: fix broken legacy mount signature checking 42c871d38e3d mac80211: check return value of rhashtable_init bda06aff03a1 net: prevent user from passing illegal stab size 3d68c7b0ab5b hwmon: (ltc2947) Properly handle errors when looking for the external clock 194e8a4f0acd m68k: Handle arrivals of multiple signals correctly 977aee58142a mac80211: Drop frames from invalid MAC address in ad-hoc mode 9ec9a975ea37 netfilter: nf_nat_masquerade: defer conntrack walk to work queue 5182d6db80bb netfilter: nf_nat_masquerade: make async masq_inet6_event handling generic bcb647c1e15d ASoC: SOF: loader: release_firmware() on load failure to avoid batching f6952b1e22c2 HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) device IDs ddc4ba737bcb netfilter: ip6_tables: zero-initialize fragment offset ddf026d6ae9a HID: apple: Fix logical maximum and usage maximum of Magic Keyboard JIS 0bcfa99e8fae ASoC: Intel: sof_sdw: tag SoundWire BEs as non-atomic 14cbfeeee41b ext4: correct the error path of ext4_write_inline_data_end() d7a15e1e4fd7 ext4: check and update i_disksize properly ---- Link: https://lore.kernel.org/r/20211014145207.979449962@linuxfoundation.org # v5.10.74 Link: https://github.com/Freescale/linux-fslc/pull/480 Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
| * linux-fslc-imx: update to v5.10.73Andrey Zhizhikin2021-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel repository has been upgraded up to v5.10.73 from stable korg. Following conflicts resolved during merge: ---- - arch/arm/mach-imx/pm-imx6.c: Drop upstream commit cb8880680bdf ("ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence") as the NXP tree has different PM mechanisms in their tree. - arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi: Fix merge conflict with alignment of node names introduced in upstream commit 10afd1597263 ("arm64: dts: ls1028a: add missing CAN nodes") ---- Following upstream commits are included in this version: ---- 0268aa579b1f Linux 5.10.73 825c00c2ee14 x86/hpet: Use another crystalball to evaluate HPET usability f2447f6587b8 x86/entry: Clear X86_FEATURE_SMAP when CONFIG_X86_SMAP=n 6bfe1f6fc876 x86/entry: Correct reference to intended CONFIG_64_BIT 5d637bc6f98a x86/sev: Return an error on a returned non-zero SW_EXITINFO1[31:0] df121cf55003 x86/Kconfig: Correct reference to MWINCHIP3D d7c36115fb81 x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI f73ca4961d51 pseries/eeh: Fix the kdump kernel crash during eeh_pseries_init 411b38fe68ba powerpc/64s: fix program check interrupt emergency stack path 18a2a2cafcf9 powerpc/bpf: Fix BPF_SUB when imm == 0x80000000 a4037dded56b RISC-V: Include clone3() on rv32 29fdb11ca88d bpf, s390: Fix potential memory leak about jit_data 2c152d9da8fe riscv/vdso: make arch_setup_additional_pages wait for mmap_sem for write killable de834e12b96d i2c: mediatek: Add OFFSET_EXT_CONF setting back f86de018fd7a i2c: acpi: fix resource leak in reconfiguration device addition 87990a60b45f powerpc/iommu: Report the correct most efficient DMA mask for PCI devices 985cca1ad11e net: prefer socket bound to interface when not in VRF 97aeed72af4f i40e: Fix freeing of uninitialized misc IRQ vector 2dc768a98c9b i40e: fix endless loop under rtnl d3a07ca78ace gve: report 64bit tx_bytes counter from gve_handle_report_stats() 35f6ddd934e6 gve: fix gve_get_stats() 9a043022522e rtnetlink: fix if_nlmsg_stats_size() under estimation 72c2a68f1d83 gve: Avoid freeing NULL pointer 5d903a694b08 gve: Correct available tx qpl check f69556a42043 drm/nouveau/debugfs: fix file release memory leak 65fff0a8efcd drm/nouveau/kms/nv50-: fix file release memory leak f86e19d918a8 drm/nouveau: avoid a use-after-free when BO init fails 008224cdc126 video: fbdev: gbefb: Only instantiate device when built for IP32 d2ccbaaa6615 drm/sun4i: dw-hdmi: Fix HDMI PHY clock setup 18d2568cc7ff bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893 40a84fcae2bf perf jevents: Tidy error handling 628b31d96711 netlink: annotate data races around nlk->bound 144715fbab1b net: sfp: Fix typo in state machine debug string 3ec73ffeef54 net/sched: sch_taprio: properly cancel timer from taprio_destroy() 60955b65bd6a net: bridge: fix under estimation in br_get_linkxstats_size() c480d15190eb net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size() cb8880680bdf ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence 2b0035d1058a dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value 10afd1597263 arm64: dts: ls1028a: add missing CAN nodes 95ba03fb4cb1 ptp_pch: Load module automatically if ID matches 442ea65d0ccb powerpc/fsl/dts: Fix phy-connection-type for fm1mac3 acff2d182c07 net_sched: fix NULL deref in fifo_set_limit() 0d2dd40a7be6 phy: mdio: fix memory leak 6e6f79e39830 net/mlx5: E-Switch, Fix double allocation of acl flow counter d70cb6c77ad9 net/mlx5e: IPSEC RX, enable checksum complete 064faa8e8a9b bpf: Fix integer overflow in prealloc_elems_and_freelist() d5f4b27c3cfc soc: ti: omap-prm: Fix external abort for am335x pruss 1d8f4447e8c4 bpf, arm: Fix register clobbering in div/mod implementation 29a19eaeb29d iwlwifi: pcie: add configuration of a Wi-Fi adapter on Dell XPS 15 6b0132f73094 xtensa: call irqchip_init only when CONFIG_USE_OF is selected 3d288ed98314 xtensa: use CONFIG_USE_OF instead of CONFIG_OF 997bec509a83 arm64: dts: qcom: pm8150: use qcom,pm8998-pon binding fbca14abc111 ath5k: fix building with LEDS=m 8aef3824e946 PCI: hv: Fix sleep while in non-sleep context when removing child devices from the bus d9b838ae390e ARM: dts: imx6qdl-pico: Fix Ethernet support 9e99ad4194a5 ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo 2ba34cf0c16c ARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo 8f977e97b2b9 soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment 14f52004bda5 ARM: at91: pm: do not panic if ram controllers are not enabled d89a313a5739 ARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL reference 25ac88e601eb soc: qcom: socinfo: Fixed argument passed to platform_set_data() ab8073794be3 bus: ti-sysc: Add break in switch statement in sysc_init_soc() 427faa29e06f riscv: Flush current cpu icache before other cpus 05287407dedf ARM: dts: qcom: apq8064: use compatible which contains chipid ac06fe40e889 ARM: dts: imx6dl-yapp4: Fix lp5562 LED driver probe 71d3ce62ac88 ARM: dts: omap3430-sdp: Fix NAND device node f9a855d1bcb2 xen/balloon: fix cancelled balloon action 9aac782ab0ab SUNRPC: fix sign error causing rpcsec_gss drops 8f174a208c4c nfsd4: Handle the NFSv4 READDIR 'dircount' hint being zero 12d4b179022a nfsd: fix error handling of register_pernet_subsys() in init_nfsd() 1bc2f315a215 ovl: fix IOCB_DIRECT if underlying fs doesn't support direct IO 9763ffd4da21 ovl: fix missing negative dentry check in ovl_rename() 1500f0c83670 mmc: sdhci-of-at91: replace while loop with read_poll_timeout 3a0feae5f642 mmc: sdhci-of-at91: wait for calibration done before proceed e5cb3680b958 mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk 13d17cc717d5 xen/privcmd: fix error handling in mmap-resource processing de1e8bd36ab4 drm/nouveau/kms/tu102-: delay enabling cursor until after assign_windows 1d4e9f27d20d usb: typec: tcpm: handle SRC_STARTUP state if cc changes feb3fe702a58 USB: cdc-acm: fix break reporting fc8b3e838bdf USB: cdc-acm: fix racy tty buffer accesses b3265b88e83b usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle 16d728110bd7 Partially revert "usb: Kconfig: using select for USB_COMMON dependency" ---- Link: https://lore.kernel.org/r/20211011134508.362906295@linuxfoundation.org # v5.10.73 Link: https://lore.kernel.org/r/20211011153306.939942789@linuxfoundation.org # v5.10.73 Link: https://lore.kernel.org/r/20211012093348.134236881@linuxfoundation.org # v5.10.73 Link: https://github.com/Freescale/linux-fslc/pull/475 Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>