Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kernel and jailhouse to L6.6.52_2.0.0 #2053

Merged
merged 3 commits into from
Jan 14, 2025
+44 −12
Merged

Update kernel and jailhouse to L6.6.52_2.0.0 #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1857d8
conf/machine: Update dtb list for 6.6.52_2.0.0
zelan-nxp Jan 6, 2025
1c2e839
jailhouse-imx: Update to L6.6.52-2.2.0 release
zelan-nxp Jan 6, 2025
c09c78f
linux-imx: Upgrade to L6.6.52_2.0.0 release
zelan-nxp Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conf/machine/imx8mp-lpddr4-evk.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/imx8mp-evk-root.dtb \
freescale/imx8mp-evk-rpmsg.dtb \
freescale/imx8mp-evk-rpmsg-lpv.dtb \
freescale/imx8mp-evk-sof-pdm.dtb \
freescale/imx8mp-evk-sof-wm8960.dtb \
freescale/imx8mp-evk-spdif-lb.dtb \
freescale/imx8mp-evk-usdhc1-m2.dtb \
Expand Down
30 changes: 27 additions & 3 deletions conf/machine/imx8qm-mek.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,42 @@ KERNEL_DEVICETREE = " \
freescale/imx8qm-mek-dsi-serdes-rpmsg.dtb \
freescale/imx8qm-mek-enet2-tja1100.dtb \
freescale/imx8qm-mek-hdmi.dtb \
freescale/imx8qm-mek-hdmi-rx.dtb \
freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
freescale/imx8qm-mek-ov5640.dtb \
freescale/imx8qm-mek-max9286-csi0.dtb \
freescale/imx8qm-mek-max9286-csi1.dtb \
freescale/imx8qm-mek-max9286-dual.dtb \
freescale/imx8qm-mek-ov5640-csi0.dtb \
freescale/imx8qm-mek-ov5640-csi0-rpmsg.dtb \
freescale/imx8qm-mek-ov5640-csi1.dtb \
freescale/imx8qm-mek-ov5640-csi1-rpmsg.dtb \
freescale/imx8qm-mek-ov5640-dual.dtb \
freescale/imx8qm-mek-ov5640-dual-rpmsg.dtb \
freescale/imx8qm-mek-pcie-ep.dtb \
freescale/imx8qm-mek-rpmsg.dtb \
freescale/imx8qm-mek-sof.dtb \
freescale/imx8qm-mek-sof-cs42888.dtb \
freescale/imx8qm-mek-sof-wm8960.dtb \
freescale/imx8qm-mek-usd-wifi.dtb \
freescale/imx8qm-mek-usdhc3-m2.dtb \
freescale/imx8qm-mek-revd-ca53.dtb \
freescale/imx8qm-mek-revd-ca72.dtb \
freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
freescale/imx8qm-mek-revd-dsi-rm67199.dtb \
freescale/imx8qm-mek-revd.dtb \
freescale/imx8qm-mek-revd-enet2-tja1100.dtb \
freescale/imx8qm-mek-revd-hdmi.dtb \
freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \
freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \
freescale/imx8qm-mek-revd-ov5640-csi0.dtb \
freescale/imx8qm-mek-revd-ov5640-csi1.dtb \
freescale/imx8qm-mek-revd-ov5640-dual.dtb \
freescale/imx8qm-mek-revd-pcie-ep.dtb \
freescale/imx8qm-mek-revd-root.dtb \
freescale/imx8qm-mek-revd-rpmsg.dtb \
freescale/imx8qm-mek-revd-sof-wm8962.dtb \
freescale/imx8qm-mek-revd-usdhc3-m2.dtb \
freescale/imx8qm-mek-revd-usd-wifi.dtb \
"

UBOOT_MAKE_TARGET = \
Expand Down
7 changes: 7 additions & 0 deletions conf/machine/imx8qxp-mek.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \
Expand Down
1 change: 1 addition & 0 deletions conf/machine/imx8ulp-lpddr4-evk.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-tpm.dtb \
"

UBOOT_CONFIG_BASENAME = "imx8ulp_evk"
Expand Down
1 change: 1 addition & 0 deletions conf/machine/imx93-9x9-lpddr4-qsb.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-tianma-wvga-panel.dtb \
"

UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"
Expand Down
2 changes: 0 additions & 2 deletions conf/machine/include/imx8x-mek.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
"

Expand Down
4 changes: 2 additions & 2 deletions recipes-extended/jailhouse/jailhouse-imx_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
PROVIDES = "jailhouse"
RPROVIDES:${PN} += "jailhouse"

SRCBRANCH = "lf-6.6.36_2.1.0"
SRCREV = "327e56941e3e96ef9a291d2decb7add21078d8de"
SRCBRANCH = "lf-6.6.52_2.2.0"
SRCREV = "44dd492a745cd8b8313fb6c7c03fb45a36d70e8a"

IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
Expand Down
4 changes: 2 additions & 2 deletions recipes-kernel/linux/linux-imx-headers_6.6.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "lf-6.6.y"
LOCALVERSION = "-6.6.36-2.1.0"
SRCREV = "d23d64eea5111e1607efcce1d601834fceec92cb"
LOCALVERSION = "-6.6.52-2.2.0"
SRCREV = "e0f9e2afd4cff3f02d71891244b4aa5899dfc786"

S = "${WORKDIR}/git"

Expand Down
6 changes: 3 additions & 3 deletions recipes-kernel/linux/linux-imx_6.6.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
require recipes-kernel/linux/linux-imx.inc

SRCBRANCH = "lf-6.6.y"
LOCALVERSION = "-6.6.36-2.1.0"
SRCREV = "d23d64eea5111e1607efcce1d601834fceec92cb"
LOCALVERSION = "-6.6.52-2.2.0"
SRCREV = "e0f9e2afd4cff3f02d71891244b4aa5899dfc786"

SRC_URI += " \
file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \
Expand All @@ -27,7 +27,7 @@ SRC_URI += " \
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
LINUX_VERSION = "6.6.36"
LINUX_VERSION = "6.6.52"

KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
Expand Down
Loading