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

Bump linux-imx to lf-6.1.36_2.1.0 #1667

Merged
merged 4 commits into from
Oct 18, 2023
Merged

Bump linux-imx to lf-6.1.36_2.1.0 #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eac105
linux-imx: Update lf-6.1.22_2.0.0 to lf-6.1.36_2.1.0
angolini Oct 17, 2023
b35c2ca
imx8mp-lpddr4-evk: Include dts for lf-6.1.36_2.1.0
angolini Oct 17, 2023
7ebfbdc
imx8qxp-mek: Include dts for lf-6.1.36_2.1.0
angolini Oct 17, 2023
3ba4648
imx93-9x9-lpddr4-qsb: Include dts for lf-6.1.36_2.1.0
angolini Oct 17, 2023
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 @@ -42,6 +42,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/imx8mp-evk-rpmsg.dtb \
freescale/imx8mp-evk-rpmsg-lpv.dtb \
freescale/imx8mp-evk-sof-wm8960.dtb \
freescale/imx8mp-evk-sof-pdm.dtb \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@otavio, @thochstein two questions here.

I expected to find KERNEL_DEVICETREE for imx8mp-ddr4-evk.conf and imx8mp-lpddr4-evk.conf in the imx8mp-evk.inc file. Is there a reason? For me it looks like the .inc file is a better place.

Should we be using ${KERNEL_DEVICETREE_BASENAME} instead?

I don´t know those boards so I'm not sure about this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't support both board flavors with the same devicetrees?

Using KERNEL_DEVICETREE_BASENAME is a good idea.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. The dtb filenames are "basic", that's why I guessed it would go to the .inc file.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you could check the kernel to see.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you could check the kernel to see.

freescale/imx8mp-evk-spdif-lb.dtb \
freescale/imx8mp-evk-usdhc1-m2.dtb \
freescale/imx8mp-evk-8mic-swpdm.dtb \
Expand Down
2 changes: 2 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 @@ -16,6 +16,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-sja1105.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
Expand Down
2 changes: 2 additions & 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,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
"

UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"
Expand Down
27 changes: 0 additions & 27 deletions recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions recipes-kernel/linux/linux-imx_6.1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,16 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU

require recipes-kernel/linux/linux-imx.inc

SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \
file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \
"

SRCBRANCH = "lf-6.1.y"
LOCALVERSION = "-6.1.22-2.0.0"
SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67"
LOCALVERSION = "-6.1.36-2.1.0"
SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3"

# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
# required by kernel-yocto.bbclass.
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
LINUX_VERSION = "6.1.22"
LINUX_VERSION = "6.1.36"

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