diff options
11 files changed, 36 insertions, 36 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 5d4b427f..e17a1c64 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -563,7 +563,7 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | |||
563 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | 563 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" |
564 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" | 564 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" |
565 | 565 | ||
566 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.2.imx" | 566 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.3.imx" |
567 | # i.MX 6 & 7 stay on weston 10.0 for fbdev | 567 | # i.MX 6 & 7 stay on weston 10.0 for fbdev |
568 | PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.4.imx" | 568 | PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.4.imx" |
569 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.4.imx" | 569 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.4.imx" |
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.0.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb index 6889f7a6..b9a7d938 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.0.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb | |||
@@ -5,17 +5,17 @@ | |||
5 | 5 | ||
6 | DESCRIPTION = "G2D library using i.MX GPU" | 6 | DESCRIPTION = "G2D library using i.MX GPU" |
7 | LICENSE = "Proprietary" | 7 | LICENSE = "Proprietary" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" |
9 | DEPENDS = "libgal-imx" | 9 | DEPENDS = "libgal-imx" |
10 | PROVIDES = "virtual/libg2d" | 10 | PROVIDES = "virtual/libg2d" |
11 | 11 | ||
12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | 12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" |
13 | IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" | 13 | IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" |
14 | IMX_SRCREV_ABBREV = "173c22a" | 14 | IMX_SRCREV_ABBREV = "fd0148d" |
15 | SRC_URI[aarch64.md5sum] = "620ea5e4df581abe5c3eaaa4e54eb910" | 15 | SRC_URI[aarch64.md5sum] = "ebc4cb8fdfa0b8ef9b11d7bb0fd4710f" |
16 | SRC_URI[aarch64.sha256sum] = "025d41007177b95dfc43fabc75447ac048ad7973cbda22970c9d36640fb990e5" | 16 | SRC_URI[aarch64.sha256sum] = "1cedc606be965b01300613ccea81b4fd589d940306bb1caa30a37c41928616ec" |
17 | SRC_URI[arm.md5sum] = "2bf68fce3a6f55e04c97f2711dbe4feb" | 17 | SRC_URI[arm.md5sum] = "77233957a27ae4da3f01d33b3fbc69d9" |
18 | SRC_URI[arm.sha256sum] = "37ca1ddb0ea6e19eaac75939517aaf5db27a47aeecf95f021a81089601933452" | 18 | SRC_URI[arm.sha256sum] = "bc168b19096a997251e7137f82ffcff404c61709cf5f227c53a099f631569f76" |
19 | 19 | ||
20 | S = "${WORKDIR}/${IMX_BIN_NAME}" | 20 | S = "${WORKDIR}/${IMX_BIN_NAME}" |
21 | 21 | ||
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index c5951adc..dedee983 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | DESCRIPTION = "G2D library using i.MX PXP" | 5 | DESCRIPTION = "G2D library using i.MX PXP" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=db4762b09b6bda63da103963e6e081de" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7" |
8 | 8 | ||
9 | PROVIDES += "virtual/libg2d" | 9 | PROVIDES += "virtual/libg2d" |
10 | 10 | ||
@@ -13,7 +13,7 @@ PV = "2.1.0+git${SRCPV}" | |||
13 | SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" | 13 | SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" |
14 | IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" | 14 | IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" |
15 | SRCBRANCH ?= "imx_2.1" | 15 | SRCBRANCH ?= "imx_2.1" |
16 | SRCREV = "8d8b48c7c3d95b6c54093a09873ae796a0f09e8a" | 16 | SRCREV = "f3adab05bd0cbb7c38578110d772e8ddf52b4e8e" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb deleted file mode 100644 index c43c9c2d..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "173c22a" | ||
6 | |||
7 | SRC_URI[md5sum] = "73f3bb663ebb6b632d2cd19b4cb48eab" | ||
8 | SRC_URI[sha256sum] = "18f25c68db762953ccbf051fc3559ab8587fdcbf84e1248275f91f8bdc9853ec" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb deleted file mode 100644 index bc226596..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "173c22a" | ||
6 | |||
7 | SRC_URI[md5sum] = "ac54634f6d9b1e20f99abd02ed433ef9" | ||
8 | SRC_URI[sha256sum] = "b28828549a75cfd5d86716e3697e9f770e1cef1e90e919b22ea3b1df5de821ca" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb new file mode 100644 index 00000000..07a92246 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "fd0148d" | ||
6 | |||
7 | SRC_URI[md5sum] = "267d3e2d580e264157b7de01df22fb66" | ||
8 | SRC_URI[sha256sum] = "15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb new file mode 100644 index 00000000..cea83ddc --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "fd0148d" | ||
6 | |||
7 | SRC_URI[md5sum] = "b76784e04f24ec9f2bedf2dd377ed5a8" | ||
8 | SRC_URI[sha256sum] = "6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | ||
diff --git a/recipes-graphics/wayland/weston_11.0.2.imx.bb b/recipes-graphics/wayland/weston_11.0.3.imx.bb index 1eea5c3c..67eae268 100644 --- a/recipes-graphics/wayland/weston_11.0.2.imx.bb +++ b/recipes-graphics/wayland/weston_11.0.3.imx.bb | |||
@@ -162,8 +162,8 @@ DEFAULT_PREFERENCE = "-1" | |||
162 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz" | 162 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz" |
163 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " | 163 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" | 164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" |
165 | SRCBRANCH = "weston-imx-11.0.2" | 165 | SRCBRANCH = "weston-imx-11.0.3" |
166 | SRCREV = "a3c5e63aa94f8d27b72780e333370be78c9a7653" | 166 | SRCREV = "a509c319b7bfc72638c9b9d8f5e4b6259aba0ab7" |
167 | S = "${WORKDIR}/git" | 167 | S = "${WORKDIR}/git" |
168 | 168 | ||
169 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" | 169 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.0+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb index b11759a1..13793132 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.0+fslc.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" | |||
9 | 9 | ||
10 | PV .= "+git${SRCPV}" | 10 | PV .= "+git${SRCPV}" |
11 | 11 | ||
12 | SRCREV = "f61778c27755cdd09abbf9ab6c19d6bd36a3cbb6" | 12 | SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c" |
13 | SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" | 13 | SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb index 807d0a3f..7aae0cd7 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb | |||
@@ -11,8 +11,8 @@ SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ | |||
11 | file://Add-makefile.patch" | 11 | file://Add-makefile.patch" |
12 | KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 12 | KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
13 | SRCBRANCH = "lf-6.1.y" | 13 | SRCBRANCH = "lf-6.1.y" |
14 | LOCALVERSION = "-6.1.36-2.1.0" | 14 | LOCALVERSION = "-6.1.55-2.2.0" |
15 | SRCREV = "dde879f98b8273df392954b1e270360b33328ec1" | 15 | SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb index 34625658..d5804634 100644 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb | |||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" | |||
6 | 6 | ||
7 | SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" | 7 | SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" |
8 | ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" | 8 | ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" |
9 | SRCBRANCH = "lf-6.1.22_2.0.0" | 9 | SRCBRANCH = "lf-6.1.55_2.2.0" |
10 | SRCREV = "dad0b927a26100ebcfbcb6ad09d64ecde767af7f" | 10 | SRCREV = "2c762259b979d7ec5a2e17df6ad823de49d43a28" |
11 | 11 | ||
12 | S = "${WORKDIR}/git/vvcam/v4l2" | 12 | S = "${WORKDIR}/git/vvcam/v4l2" |
13 | 13 | ||