[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-218-g13bd1dcd9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-218-g13bd1dcd9
|
From: Sébastien S. <ss...@us...> - 2021-01-04 11:05:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 13bd1dcd941b70b90198e6131b6591b722effb0a (commit)
via eedcbd021f1d6a574d091efaa0e9b600caef7652 (commit)
from b18b304402e553f2415b4e52cc137b6d5760848c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 13bd1dcd941b70b90198e6131b6591b722effb0a
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 4 11:58:53 2021 +0100
[BUILDROOT] 2020.02: imx-gpu-{g2d,viv}: sync with NXP kernel 5.4.24-2.1.0
commit eedcbd021f1d6a574d091efaa0e9b600caef7652
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 4 12:02:10 2021 +0100
[PATCH] 5.4.imx_legacy: i.MX8MM: enable VPU and GPU
-----------------------------------------------------------------------
Summary of changes:
...escale-imx-imx-gpu-g2d-bump-to-version-6..patch | 50 ++++++++++++++++++++
...escale-imx-imx-gpu-viv-bump-to-version-6..patch | 53 ++++++++++++++++++++++
...escale-imx-imx-gpu-viv-remove-fb-headers-.patch | 48 ++++++++++++++++++++
...-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch | 51 +++++++++++++++++++++
4 files changed, 202 insertions(+)
create mode 100644 patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch
create mode 100644 patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch
create mode 100644 patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch
create mode 100644 patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch
diff --git a/patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch b/patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch
new file mode 100644
index 000000000..fe76468b5
--- /dev/null
+++ b/patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch
@@ -0,0 +1,50 @@
+From a7e94ce9915ddd257c64adc236dd280290624303 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Thu, 16 Jul 2020 16:48:35 +0200
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-g2d: bump to version
+ 6.4.0.p2.4
+
+- Same version as NXP release 5.4.24-2.1.0
+- No changelog provided by NXP
+- COPYING/EULA update: LA_OPT_NXP_Software_License v11 February 2020
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash | 8 ++++----
+ package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
+index 98ca7fbe7e..4ff5926482 100644
+--- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
++++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
+@@ -1,5 +1,5 @@
+ # Locally calculated
+-sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-arm.bin
+-sha256 35885f435dbe951d2c0f439a376ed8a59a50b67a1b7e1e14fa2ab03995abb1ad imx-gpu-g2d-6.4.0.p1.0-aarch64.bin
+-sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
+-sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
++sha256 010bab5780476f26406e16b058514453dc235a0e7f4b995fa03c976d06e5cb96 imx-gpu-g2d-6.4.0.p2.4-arm.bin
++sha256 553bbe9ee1caa222fd14b835deb2afedf9ed936b7a13424328df75892286f666 imx-gpu-g2d-6.4.0.p2.4-aarch64.bin
++sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING
++sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA
+diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+index 7700170970..15cfe66f0b 100644
+--- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
++++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+@@ -5,9 +5,9 @@
+ ################################################################################
+
+ ifeq ($(BR2_aarch64),y)
+-IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64
++IMX_GPU_G2D_VERSION = 6.4.0.p2.4-aarch64
+ else
+-IMX_GPU_G2D_VERSION = 6.4.0.p1.0-arm
++IMX_GPU_G2D_VERSION = 6.4.0.p2.4-arm
+ endif
+ IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE)
+ IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch b/patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch
new file mode 100644
index 000000000..91b85f27c
--- /dev/null
+++ b/patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch
@@ -0,0 +1,53 @@
+From 4f0f5491147f10327bb4f71d67d027e8d1b03f88 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Thu, 16 Jul 2020 16:48:36 +0200
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-viv: bump to version
+ 6.4.0.p2.4
+
+- Same version as NXP release 5.4.24-2.1.0
+- No changelog provided by NXP
+- COPYING/EULA update: LA_OPT_NXP_Software_License v11 February 2020
+- Tested on Nitrogen8M device with Weston (DRM backend) as follows:
+ # cd /usr/share/examples/viv_samples/vdk/
+ # ./tutorial7
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 8 ++++----
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
+index 1a67b53ac5..6de74a9496 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
+@@ -1,5 +1,5 @@
+ # Locally calculated
+-sha256 b5c94b56a9f7c84aa084603a6ca21b5f3941b400e4f6ee8558b58c9b9f1aab36 imx-gpu-viv-6.4.0.p1.0-aarch32.bin
+-sha256 45852a5c3c61a9215a2ffb7387a6e1cce7ddac6f12513fc77459ad7e1f1b3a27 imx-gpu-viv-6.4.0.p1.0-aarch64.bin
+-sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
+-sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
++sha256 9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5 imx-gpu-viv-6.4.0.p2.4-aarch32.bin
++sha256 a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720 imx-gpu-viv-6.4.0.p2.4-aarch64.bin
++sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING
++sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index 646d4e3673..b6b070e4f6 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -5,9 +5,9 @@
+ ################################################################################
+
+ ifeq ($(BR2_aarch64),y)
+-IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch64
++IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch64
+ else
+-IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch32
++IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch32
+ endif
+ IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE)
+ IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch b/patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch
new file mode 100644
index 000000000..03083cd81
--- /dev/null
+++ b/patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch
@@ -0,0 +1,48 @@
+From 6d21635c36dbbc4c44ec9f83663858b9b46457a1 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Tue, 27 Oct 2020 18:12:45 +0100
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-viv: remove fb headers
+ fixup
+
+As it doesn't seem to be needed any longer. Also it was agreed to fix
+packages not using pkgconfig properly instead of doing this sed.
+
+Tested on i.MX6 platform with Qt5, no more issues.
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index b6b070e4f6..fca8a4d447 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -58,15 +58,6 @@ define IMX_GPU_VIV_BUILD_CMDS
+ ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so
+ endef
+
+-ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
+-define IMX_GPU_VIV_FIXUP_FB_HEADERS
+- $(SED) '39i\
+- #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
+- #define EGL_API_FB \n\
+- #endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h
+-endef
+-endif
+-
+ ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
+ define IMX_GPU_VIV_FIXUP_PKGCONFIG
+ ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
+@@ -89,7 +80,6 @@ endif
+
+ define IMX_GPU_VIV_INSTALL_STAGING_CMDS
+ cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
+- $(IMX_GPU_VIV_FIXUP_FB_HEADERS)
+ $(IMX_GPU_VIV_FIXUP_PKGCONFIG)
+ for lib in egl gbm glesv1_cm glesv2 vg; do \
+ $(INSTALL) -m 0644 -D \
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch b/patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch
new file mode 100644
index 000000000..70af85ca5
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch
@@ -0,0 +1,51 @@
+From 93f098843dc45a5a76557885c7307bd1cf885531 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 16 Oct 2020 11:07:01 +0200
+Subject: [PATCH 519/519] arm64: dts: imx8mm-opos8mmdev: enable VPU and GPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../boot/dts/freescale/imx8mm-opos8mmdev.dts | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+index daceb62cf1d9..791e3d3f384c 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+@@ -122,6 +122,10 @@
+ };
+ };
+
++&gpu {
++ status = "okay";
++};
++
+ &i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c3>;
+@@ -231,6 +235,18 @@
+ status = "okay";
+ };
+
++&vpu_g1 {
++ status = "okay";
++};
++
++&vpu_g2 {
++ status = "okay";
++};
++
++&vpu_h1 {
++ status = "okay";
++};
++
+ &iomuxc {
+ pinctrl_backlight: backlightgrp {
+ fsl,pins = <
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|