From 721ce007fd8e09e982f0435d4aa3f75ef5de9594 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 21 Nov 2022 18:33:02 +0100 Subject: kernel-module-nxp89xx: upgrade to mxm5x17344.p3 Update to the version used in lf5.15.52_2.1.0. Signed-off-by: Max Krummenacher (cherry picked from commit 9734381aa2bfb04fca41f4b256462a24b32aafd0) --- recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb index 00747f72..827dc94a 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb @@ -2,10 +2,10 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8997/8987" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77" -SRCBRANCH = "lf-5.10.72_2.2.0" -MRVL_SRC ?= "git://source.codeaurora.org/external/imx/mwifiex.git;protocol=https" +SRCBRANCH = "lf-5.15.52_2.1.0" +MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" -SRCREV = "3c2a3c2cd25e9dce95f34c21bb4e728647eb64ee" +SRCREV = "5cda905576fd26eca6b49d0f0fb5e2bb3c0bf441" S = "${WORKDIR}/git/mxm_wifiex/wlan_src" -- cgit v1.2.3-54-g00ecf From c24381b41c56cad8c482b57b598edc5e352010d4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 21 Nov 2022 17:19:19 +0100 Subject: kernel-module-isp-vvcam: upgrade from 4.2.2.18.0 to 4.2.2.19.0 Update to the version used in lf5.15.52_2.1.0. Commit history: * b26ee8a LF-6957: P19 os08a20 4K@30fps image is abnormal * c98a7dc LF-6890: media: isp: fix build error due to API renamed * 62545f6 M865SW-984: Reduce write isp registers' risks that leaded the vvext test met system hung issue. * 6b4cb8e M865SW-1031: the second isp port jump frames * 11110c0 LF-6655: ISP Camera: os08a20 4k@15fps ISP stiching HDR setting support * 6be15f1 LF-6619: CAPTURE: os08a20 4k@30fps linear mode support * 48fb81b LF-6601-1: Update vvcam P19 release for the vvcam * aa19ac5 fix the rmmod vvcam-isp kernel null point * 1481da2 add the isp multiply power domain device link ways. Signed-off-by: Max Krummenacher (cherry picked from commit 7f551ae01ebfa29b155671565885b711dee020c0) --- .../kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb | 16 ---------------- .../kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb (limited to 'recipes-kernel') diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb deleted file mode 100644 index 078f6a61..00000000 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "Kernel loadable module for ISP" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" - -SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" -ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https" -SRCBRANCH = "lf-5.15.y_2.0.0" -SRCREV = "551415470092d6af1d7e11e7a78591f5800333f9" - -S = "${WORKDIR}/git/vvcam/v4l2" - -inherit module - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb new file mode 100644 index 00000000..816d4acc --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb @@ -0,0 +1,16 @@ +# Copyright 2020-2021 NXP + +DESCRIPTION = "Kernel loadable module for ISP" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" + +SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" +ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" +SRCBRANCH = "lf-5.15.y_2.1.0" +SRCREV = "b26ee8a5402afd7488716e06d82147669c05eb4a" + +S = "${WORKDIR}/git/vvcam/v4l2" + +inherit module + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 0be949f5bd324a381ec54864df2b2e41218e2aaa Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 24 Nov 2022 18:43:21 +0100 Subject: kernel-module-isp-vvcam: prevent oe qa warning When building objects in a path like ${S}/../isp/isp_miv1.o the resulting object files do not get their paths rewriten with the bitbake.conf provided DEBUG_PREFIX_MAP rules. Set DEBUG_PREFIX_MAP to the parent of ${S} to prevent the following warnings: | WARNING: kernel-module-isp-vvcam-4.2.2.19.0-r0 do_package_qa: QA Issue: | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/sensor/ar1335/.debug/ar1335.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/sensor/os08a20/.debug/os08a20.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/sensor/ov2775/.debug/ov2775.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/.debug/vvcam-dwe.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/.debug/vvcam-isp.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/focus/vcm_dw9790/.debug/vcm-dw9790.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR | File /lib/modules/5.15.77-5.15.77-2.1.0+g7547e8bfc01a/extra/video/.debug/vvcam-video.ko in package kernel-module-isp-vvcam-dbg contains reference to TMPDIR [buildpaths] Signed-off-by: Max Krummenacher (cherry picked from commit af6f0c510085280500372c07157e9edd68122d38) --- .../kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'recipes-kernel') diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb index 816d4acc..05431165 100644 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb @@ -10,6 +10,14 @@ SRCBRANCH = "lf-5.15.y_2.1.0" SRCREV = "b26ee8a5402afd7488716e06d82147669c05eb4a" S = "${WORKDIR}/git/vvcam/v4l2" +DEBUG_PREFIX_MAP = "-fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${STAGING_DIR_HOST}= \ + -fmacro-prefix-map=${STAGING_DIR_HOST}= \ + -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ +" inherit module -- cgit v1.2.3-54-g00ecf