summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@foundries.io>2023-07-19 15:20:04 +0300
committerOleksandr Suvorov <oleksandr.suvorov@foundries.io>2023-07-20 12:52:13 +0300
commit1ec28a6c1e0a2ecead479f6cca3676ed914d9da2 (patch)
treef62ceff30e02fcd55a5eebf4d70d86dd0285a4d6 /conf
parent953c5f77eb4d6fe9847a149340dc67314cdabef9 (diff)
downloadmeta-freescale-1ec28a6c1e0a2ecead479f6cca3676ed914d9da2.tar.gz
linux-fslc-imx: Update to 6.1-2.0.x-imx
Upgrade the kernel to 6.1-2.0.x-imx based on the NXP kernel sources with the tag lf-6.1.22-2.0.0 and the mainline stable linux-6.1.y. Stable version: 6.1.38 Relevant internal commits: - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X - 6c41233a2cfbe pwm: pwm-adp5585: fix get_state callback prototype - 9c7540ecb891f pwm: pwm-rpmsg-imx: fix get_state callback prototype Remove obsolete imx6ul{l|z}-*-sdio3 dtbs as per [1]. 27548edcb4934 ("LF-8794-1 arm: dts: remove all imx6ul(l/z) btwifi-sdio3_0.dts file") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6ullevk.conf1
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf1
2 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index a773bb6a..60668c2f 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -17,7 +17,6 @@ KERNEL_DEVICETREE = " \
17 17
18KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 18KERNEL_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 994ad850..6cb1698d 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -16,7 +16,6 @@ KERNEL_DEVICETREE = " \
16" 16"
17KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 17KERNEL_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"