diff options
| -rw-r--r-- | conf/machine/imx6ullevk.conf | 1 | ||||
| -rw-r--r-- | conf/machine/imx6ulz-14x14-evk.conf | 1 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.1.bb | 16 |
3 files changed, 10 insertions, 8 deletions
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index a773bb6a1..60668c2fa 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf | |||
| @@ -17,7 +17,6 @@ KERNEL_DEVICETREE = " \ | |||
| 17 | 17 | ||
| 18 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 18 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
| 19 | imx6ull-14x14-evk-btwifi.dtb \ | 19 | imx6ull-14x14-evk-btwifi.dtb \ |
| 20 | imx6ull-14x14-evk-btwifi-sdio3_0.dtb \ | ||
| 21 | imx6ull-14x14-evk-emmc.dtb \ | 20 | imx6ull-14x14-evk-emmc.dtb \ |
| 22 | imx6ull-14x14-evk-gpmi-weim.dtb \ | 21 | imx6ull-14x14-evk-gpmi-weim.dtb \ |
| 23 | " | 22 | " |
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index 994ad850c..6cb1698db 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf | |||
| @@ -16,7 +16,6 @@ KERNEL_DEVICETREE = " \ | |||
| 16 | " | 16 | " |
| 17 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 17 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
| 18 | imx6ulz-14x14-evk-btwifi.dtb \ | 18 | imx6ulz-14x14-evk-btwifi.dtb \ |
| 19 | imx6ull-14x14-evk-btwifi-sdio3_0.dtb \ | ||
| 20 | imx6ulz-14x14-evk-emmc.dtb \ | 19 | imx6ulz-14x14-evk-emmc.dtb \ |
| 21 | imx6ulz-14x14-evk-gpmi-weim.dtb \ | 20 | imx6ulz-14x14-evk-gpmi-weim.dtb \ |
| 22 | " | 21 | " |
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb index 8c26da775..1dcb1f916 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb | |||
| @@ -28,17 +28,21 @@ 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.24 | 31 | # tag: v6.1.38 |
| 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.1-1.0.0 | 36 | # tag: lf-6.1.22-2.0.0 |
| 37 | # | 37 | # |
| 38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
| 39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
| 40 | # ------------------------------------------------------------------------------ | 40 | # ------------------------------------------------------------------------------ |
| 41 | # - ad9ab3b3c553c ARM: imx_v7_defconfig: Remove KERNEL_LZO config | 41 | # - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS |
| 42 | # - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config | ||
| 43 | # - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X | ||
| 44 | # - 6c41233a2cfbe pwm: pwm-adp5585: fix get_state callback prototype | ||
| 45 | # - 9c7540ecb891f pwm: pwm-rpmsg-imx: fix get_state callback prototype | ||
| 42 | # | 46 | # |
| 43 | # NOTE to upgraders: | 47 | # NOTE to upgraders: |
| 44 | # This recipe should NOT collect individual patches, they should be applied to | 48 | # This recipe should NOT collect individual patches, they should be applied to |
| @@ -48,16 +52,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
| 48 | 52 | ||
| 49 | require linux-imx.inc | 53 | require linux-imx.inc |
| 50 | 54 | ||
| 51 | KBRANCH = "6.1-1.0.x-imx" | 55 | KBRANCH = "6.1-2.0.x-imx" |
| 52 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 56 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
| 53 | SRCREV = "ad9ab3b3c553cbc3c61f233b6e2cd5abdd2a624b" | 57 | SRCREV = "b872b1170fc8843b55e9f8838dd373ff43bb7552" |
| 54 | 58 | ||
| 55 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 59 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
| 56 | # required by kernel-yocto.bbclass. | 60 | # required by kernel-yocto.bbclass. |
| 57 | # | 61 | # |
| 58 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 62 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
| 59 | # should be updated once patchlevel is merged. | 63 | # should be updated once patchlevel is merged. |
| 60 | LINUX_VERSION = "6.1.24" | 64 | LINUX_VERSION = "6.1.38" |
| 61 | 65 | ||
| 62 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 66 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
| 63 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 67 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |
