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

Upgrade Graphics BSP to LF6.6.52_2.2.0 #2070

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade Graphics BSP to LF6.6.52_2.2.0 #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc06ba7
imx-g2d*: Upgrade Graphics BSP to LF6.6.52_2.2.0
valijec Jan 15, 2025
548f3ba
imx-gpu-viv*: Upgrade Graphics BSP to LF6.6.52_2.2.0
valijec Jan 15, 2025
26086c2
xwayland*: Upgrade Graphics BSP to LF6.6.52_2.2.0
valijec Jan 15, 2025
d270be3
weston: Upgrade Graphics BSP to LF6.6.52_2.2.0
valijec Jan 15, 2025
bd7576c
mali-imx: Upgrade Graphics BSP to LF6.6.52_2.2.0
valijec Jan 15, 2025
ee0c506
libsdl2: Upgrade Graphics BSP to LF6.6.52_2.2.0
valijec Jan 15, 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
2 changes: 1 addition & 1 deletion conf/machine/include/imx-base.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ PREFERRED_VERSION_weston:imx-mainline-bsp = ""

PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.32.imx"

PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.2.5.imx"

# Use i.MX libdrm Version
PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
Expand Down
8 changes: 4 additions & 4 deletions ...pes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb → ...pes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ PROVIDES += "virtual/libg2d"
SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"

IMX_SRCREV_ABBREV = "7943590"
IMX_SRCREV_ABBREV = "e2dce80"
IMX_SRC_URI_NAME = "v1"
SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113"
SRC_URI[v1.sha256sum] = "d43b5d4b8e6015a029c6e8854982aa5d57de25bc0e3ff8209d4aab7679c2d240"

IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590"
IMX_SRCREV_ABBREV:mx95-nxp-bsp = "e2dce80"
IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076"
SRC_URI[v2.sha256sum] = "d9845356e0c9c959b1d57ebb3ee668ba6aa2b864999263a8c33cb053b83584e6"

S = "${WORKDIR}/${IMX_BIN_NAME}"

Expand Down
6 changes: 3 additions & 3 deletions ...aphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb → ...phics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ PROVIDES = "virtual/libg2d"

SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
IMX_SRCREV_ABBREV = "95408a4"
SRC_URI[aarch64.sha256sum] = "48327fe6315aa739d5665004289412ff2e3a4e0084d1664f837276f09d35b032"
SRC_URI[arm.sha256sum] = "f28b2cd7b29302cd654fc845a0695d6fe935e383b56556e36933488dfa014830"
IMX_SRCREV_ABBREV = "accdd64"
SRC_URI[aarch64.sha256sum] = "780479f19142126ed58e12222b80f8f3b882ad3d223ff61b7ea02001f517ff03"
SRC_URI[arm.sha256sum] = "cd4fd05dd6f6880edc3255c85fe08094a07ea4cd3eee947df004dcb8f37bc8fa"

S = "${WORKDIR}/${IMX_BIN_NAME}"

Expand Down
2 changes: 1 addition & 1 deletion recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ IMX_SOC:mx8mq-nxp-bsp = "mx8mq"
IMX_SOC:mx8mn-nxp-bsp = "mx8mn"
IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"

LIBVULKAN_API_VERSION = "1.3.239"
LIBVULKAN_API_VERSION = "1.3.204"

do_install () {
install -d ${D}${libdir}
Expand Down
6 changes: 3 additions & 3 deletions ...pu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb → ...u-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
require imx-gpu-viv-6.inc

LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"

IMX_SRCREV_ABBREV = "95408a4"
IMX_SRCREV_ABBREV = "accdd64"

SRC_URI[sha256sum] = "c479c98e83866a7e95e5a6ae29b21ae41f9599326298d9a1debf009cac6e9406"
SRC_URI[sha256sum] = "2242c7cbf1a2b07d40eefe5d1507747e477c54912f179ee0585a5d7965074ce0"

COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
6 changes: 3 additions & 3 deletions ...pu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb → ...u-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
require imx-gpu-viv-6.inc

LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"

IMX_SRCREV_ABBREV = "95408a4"
IMX_SRCREV_ABBREV = "accdd64"

SRC_URI[sha256sum] = "aadfcf558d07da253a57acfd5aa4ca41d4c8195f04324d0c2f6746f6f18c5a46"
SRC_URI[sha256sum] = "8108fd146de6986486f34860227511a5101b31072b99cd78ae38afba8939fd4e"

COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
2 changes: 2 additions & 0 deletions recipes-graphics/libsdl2/libsdl2_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ CFLAGS:append:imxgpu = " -DLINUX \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DWL_EGL_PLATFORM', '', d)} \
"
PACKAGECONFIG:append:imx-nxp-bsp = " ${PACKAGECONFIG_LIBDECOR}"
PACKAGECONFIG_LIBDECOR ??= "libdecor"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please follow proper variable ordering and place this at the top of the bbappend.

https://docs.yoctoproject.org/dev/singleindex.html#recipe-ordering

6 changes: 3 additions & 3 deletions recipes-graphics/mali/mali-imx_r50.0.bb → recipes-graphics/mali/mali-imx_r50.2.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
require mali-imx.inc

LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"

SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
SRC_URI[sha256sum] = "a787a3285c3e288eedacf1a746de2bc9f5fdc15f35cf8b6147deb436183baf6f"
IMX_SRCREV_ABBREV = "39604c3"
SRC_URI[sha256sum] = "947881cdad085a29dcb52dc4431f803b73c06141b31e06520f9bfe17d324f774"
IMX_SRCREV_ABBREV = "710cfb6"

S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"

Expand Down
2 changes: 1 addition & 1 deletion recipes-graphics/wayland/weston_10.0.5.imx.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch
SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \
file://0001-g2d-renderer.c-Include-sys-stat.h.patch"
SRCBRANCH = "weston-imx-10.0.5"
SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4"
SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f"
S = "${WORKDIR}/git"

# Disable OpenGL for parts with GPU support for 2D but not 3D
Expand Down
2 changes: 1 addition & 1 deletion recipes-graphics/wayland/weston_12.0.4.imx.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
SRCBRANCH = "weston-imx-12.0.4"
SRCREV = "c3c1f9ff7824123dd4808ace3c9476345cb84177"
SRCREV = "de7f8df4b4275e9bb345cacab6962d1a490d9eab"
S = "${WORKDIR}/git"

PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
Expand Down
4 changes: 2 additions & 2 deletions ...-graphics/xwayland/xwayland_23.1.1.imx.bb → ...-graphics/xwayland/xwayland_23.2.5.imx.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"

SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz"
BP_ORIGINAL = "${BPN}-23.1.1"
SRC_URI[sha256sum] = "fb9461f5cb9fea5e07e91882311b0c88b43e8843b017ebac05eb5af69aa34c15"
BP_ORIGINAL = "${BPN}-23.2.5"
SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90"
S = "${WORKDIR}/${BP_ORIGINAL}"

UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
Expand Down
6 changes: 2 additions & 4 deletions ...ics/xwayland/xwayland_23.1.1.imx.bbappend → ...ics/xwayland/xwayland_23.2.5.imx.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ SRC_URI:append:imxgpu = " \

OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU = ""
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx9-nxp-bsp = "glamor glx"

# links with imx-gpu libs which are pre-built for glibc
# gcompat will address it during runtime
LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"

RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"

PACKAGE_ARCH = "${MACHINE_SOCARCH}"
PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}"