diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.12.bb | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.12.bb b/recipes-kernel/linux/linux-fslc-imx_6.12.bb index ef87e8146..b3b0f190f 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.12.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.12.bb | |||
@@ -42,24 +42,22 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
42 | # conflicts, prioritizing NXP BSP source code as the latest vendor updates. | 42 | # conflicts, prioritizing NXP BSP source code as the latest vendor updates. |
43 | # Additional commits may exist to better acommodate yocto builds. | 43 | # Additional commits may exist to better acommodate yocto builds. |
44 | # | 44 | # |
45 | # $ git log --oneline --no-merges v6.12.34.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y | 45 | # $ git log --oneline --no-merges v6.12.49.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y |
46 | # - 8d94e52076a1 Revert "firmware: arm_scmi: Fix i.MX build dependency" | 46 | # - bacd5504126bb imx8mp-olimex.dts: CSI GPIO pins |
47 | # - adefe4ecd9c6 Revert "PCI: imx6: Fix suspend/resume support on i.MX6QDL" | 47 | # - 3a7012e991c98 hwrng: optee: support generic crypto |
48 | # - 2837cecae149 imx8mp-olimex.dts: CSI GPIO pins | 48 | # - 6c0a3377748eb arm64: dts: imx8mq: drop cpu-idle-states |
49 | # - 29efe53139ac hwrng: optee: support generic crypto | 49 | # - 7db0692d9ff5e of: enable using OF_DYNAMIC without OF_UNITTEST |
50 | # - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states | 50 | # - eff98b934385c gpu: drm: cadence: select hdmi helper |
51 | # - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST | 51 | # - be5e175e43d93 imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error |
52 | # - 1bd794e571f6 gpu: drm: cadence: select hdmi helper | 52 | # - 76e18f5a57b3e arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth |
53 | # - d74361dc9bdc imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error | 53 | # - 06b99391f850c drm: of: Fix build without CONFIG_OF |
54 | # - 90900e871607 arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth | 54 | # - 17ac89e381a9d i2c: imx: Remove unnecessary clock reconfiguration |
55 | # - 24ef2924dd5f drm: of: Fix build without CONFIG_OF | 55 | # - 6d157e81ccc53 drm/imx: lcdifv3: Fix videomode settings |
56 | # - a97fe216ede5 i2c: imx: Remove unnecessary clock reconfiguration | 56 | # - 0a355239e2df3 clk: imx: imx8qm: add more resources to whitelist |
57 | # - 93e7f87e7bc6 drm/imx: lcdifv3: Fix videomode settings | 57 | # - c5c4869899b1c arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes |
58 | # - ff2397021b0d clk: imx: imx8qm: add more resources to whitelist | 58 | # - 3159e7d086295 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include |
59 | # - e0fc64f7a2f8 arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes | 59 | # - ffea393034d48 arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610 |
60 | # - 98b777bfa849 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include | 60 | # - a8762ad609202 imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND |
61 | # - 2d0aefc287a7 arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610 | ||
62 | # - 44aadbd00c61 imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND | ||
63 | # | 61 | # |
64 | # NOTE to upgraders: | 62 | # NOTE to upgraders: |
65 | # This recipe should NOT collect individual patches, they should be applied to | 63 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -69,16 +67,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
69 | 67 | ||
70 | require linux-imx.inc | 68 | require linux-imx.inc |
71 | 69 | ||
72 | KBRANCH = "6.12-1.0.x-imx" | 70 | KBRANCH = "6.12-2.0.x-imx" |
73 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 71 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
74 | SRCREV = "c63da44a120c9ad720877a74f0c94e2d9b08cab1" | 72 | SRCREV = "77b58422ab0fa4480a0b89a5f1ebfb9d1a900aef" |
75 | 73 | ||
76 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 74 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
77 | # required by kernel-yocto.bbclass. | 75 | # required by kernel-yocto.bbclass. |
78 | # | 76 | # |
79 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 77 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
80 | # should be updated once patchlevel is merged. | 78 | # should be updated once patchlevel is merged. |
81 | LINUX_VERSION = "6.12.34" | 79 | LINUX_VERSION = "6.12.49" |
82 | 80 | ||
83 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 81 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
84 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 82 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |