diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2023-12-15 13:30:05 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 13:30:05 -0300 |
| commit | c06a18b1e1be2248399d4b5f6568095e170cb19e (patch) | |
| tree | 4b75626cea60307a18e097f15ccf5a9271695bae | |
| parent | 1b53842e3ccd7f96597c38da78fe1544a2c4d642 (diff) | |
| parent | ec9963bfff30f0c46cf8a5725999581f1ef5f011 (diff) | |
| download | meta-freescale-c06a18b1e1be2248399d4b5f6568095e170cb19e.tar.gz | |
Merge pull request #1706 from MrCry0/master-linux-6.1.36
linux-fslc-imx: Merge NXP changes from lf-6.1.36-2.1.0
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.1.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb index 3f028b843..403c2c6f3 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb | |||
| @@ -28,16 +28,17 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
| 28 | # ------------------------------------------------------------------------------ | 28 | # ------------------------------------------------------------------------------ |
| 29 | # 1. Stable (tag or SHA(s)) | 29 | # 1. Stable (tag or SHA(s)) |
| 30 | # ------------------------------------------------------------------------------ | 30 | # ------------------------------------------------------------------------------ |
| 31 | # tag: v6.1.38 | 31 | # tag: v6.1.57 |
| 32 | # | 32 | # |
| 33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
| 34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
| 35 | # ------------------------------------------------------------------------------ | 35 | # ------------------------------------------------------------------------------ |
| 36 | # tag: lf-6.1.22-2.0.0 | 36 | # tag: lf-6.1.36-2.1.0 |
| 37 | # | 37 | # |
| 38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
| 39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
| 40 | # ------------------------------------------------------------------------------ | 40 | # ------------------------------------------------------------------------------ |
| 41 | # - d9e9cb8ce9bc7 hx280enc_vc8000e: fix misplaced #endif | ||
| 41 | # - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS | 42 | # - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS |
| 42 | # - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config | 43 | # - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config |
| 43 | # - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X | 44 | # - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X |
| @@ -56,7 +57,7 @@ KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" | |||
| 56 | 57 | ||
| 57 | KBRANCH = "6.1-2.1.x-imx" | 58 | KBRANCH = "6.1-2.1.x-imx" |
| 58 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 59 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
| 59 | SRCREV = "3f41fbe42851375d3d5996e4bf9e9809e6c79517" | 60 | SRCREV = "241e2f51bd87beb652196d1db92f0387c1209bfb" |
| 60 | 61 | ||
| 61 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 62 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
| 62 | # required by kernel-yocto.bbclass. | 63 | # required by kernel-yocto.bbclass. |