diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.1.bb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb index 403c2c6f..6e3838be 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb | |||
@@ -28,22 +28,23 @@ 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.57 | 31 | # tag: v6.1.70 |
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.36-2.1.0 | 36 | # tag: lf-6.1.55-2.2.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 | # - 77a660738af5 Revert "net: stmmac: fix FPE events losing" |
42 | # - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS | 42 | # - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif |
43 | # - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config | 43 | # - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS |
44 | # - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X | 44 | # - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config |
45 | # - 6c41233a2cfbe pwm: pwm-adp5585: fix get_state callback prototype | 45 | # - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X |
46 | # - 9c7540ecb891f pwm: pwm-rpmsg-imx: fix get_state callback prototype | 46 | # - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype |
47 | # - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype | ||
47 | # | 48 | # |
48 | # NOTE to upgraders: | 49 | # NOTE to upgraders: |
49 | # This recipe should NOT collect individual patches, they should be applied to | 50 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -55,16 +56,16 @@ require linux-imx.inc | |||
55 | 56 | ||
56 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" | 57 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" |
57 | 58 | ||
58 | KBRANCH = "6.1-2.1.x-imx" | 59 | KBRANCH = "6.1-2.2.x-imx" |
59 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 60 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
60 | SRCREV = "241e2f51bd87beb652196d1db92f0387c1209bfb" | 61 | SRCREV = "32a344619c750cdcbe31bed754adc1b30d362e45" |
61 | 62 | ||
62 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 63 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
63 | # required by kernel-yocto.bbclass. | 64 | # required by kernel-yocto.bbclass. |
64 | # | 65 | # |
65 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 66 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
66 | # should be updated once patchlevel is merged. | 67 | # should be updated once patchlevel is merged. |
67 | LINUX_VERSION = "6.1.57" | 68 | LINUX_VERSION = "6.1.70" |
68 | 69 | ||
69 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 70 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
70 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 71 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |