[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-256-g0ab1d0719
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-256-g0ab1d0719
|
From: Sébastien S. <ss...@us...> - 2021-05-03 14:06:44
|
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 0ab1d0719d5b469f4de2cbb211f8445ae3f6f01b (commit)
via 4c899d8adb618409f5ad46dbd6e2308ed7761112 (commit)
from 4a7ca6862f4c787804949f1393736928cbf6a9ed (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 0ab1d0719d5b469f4de2cbb211f8445ae3f6f01b
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 3 15:57:16 2021 +0200
[BUILDROOT] Bump BR to 2021.02.1
commit 4c899d8adb618409f5ad46dbd6e2308ed7761112
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 3 15:54:59 2021 +0200
[BUILDROOT] 2021.02: backport (pending) patches to fix imx-gpu-viv
imx-gpu-viv needs libdrm
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +-
buildroot/configs/apf27_defconfig | 6 +-
...e-freescale-imx-imx-gpu-viv-select-libdrm.patch | 68 ++++++++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 1 +
4 files changed, 74 insertions(+), 5 deletions(-)
create mode 100644 patches/buildroot/2021.02/399-package-freescale-imx-imx-gpu-viv-select-libdrm.patch
diff --git a/Makefile b/Makefile
index fceeb3b9c..ca5156a07 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-BUILDROOT_MAJOR_VERSION ?= 2020.02
-BUILDROOT_MINOR_VERSION ?= 11
+BUILDROOT_MAJOR_VERSION ?= 2021.02
+BUILDROOT_MINOR_VERSION ?= 1
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index dc01a9d46..01626ce9a 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -85,6 +85,6 @@ BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
+BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x20000"
diff --git a/patches/buildroot/2021.02/399-package-freescale-imx-imx-gpu-viv-select-libdrm.patch b/patches/buildroot/2021.02/399-package-freescale-imx-imx-gpu-viv-select-libdrm.patch
new file mode 100644
index 000000000..28cb47ad6
--- /dev/null
+++ b/patches/buildroot/2021.02/399-package-freescale-imx-imx-gpu-viv-select-libdrm.patch
@@ -0,0 +1,68 @@
+From 86462450b543463e3391fed8583ce1151527c05c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 28 Apr 2021 10:18:49 +0200
+Subject: [PATCH v2 1/1] package/freescale-imx/imx-gpu-viv: select libdrm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some libraries (libGL.so, vivante_dri.so, libEGL.so, libgbm_viv.so) are
+linked against libdrm so select libdrm package.
+
+Fixes: 8283e838f040 ("package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p1.2")
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+
+Changes for v2:
+ - libdrm is not needed on ARM with framebuffer output.
+
+ package/freescale-imx/imx-gpu-viv/Config.in | 5 +++--
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 7 ++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in
+index cca2689905..6668ee8bb5 100644
+--- a/package/freescale-imx/imx-gpu-viv/Config.in
++++ b/package/freescale-imx/imx-gpu-viv/Config.in
+@@ -12,6 +12,9 @@ config BR2_PACKAGE_IMX_GPU_VIV
+ depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64
+ # Library binaries are linked against libc.so.6
+ depends on BR2_TOOLCHAIN_USES_GLIBC
++ # Library binaries are linked against libdrm.so.2, except framebuffer
++ # output on ARM
++ select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB)
+ select BR2_PACKAGE_HAS_LIBEGL
+ select BR2_PACKAGE_HAS_LIBGLES
+ select BR2_PACKAGE_HAS_LIBOPENCL
+@@ -56,8 +59,6 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB
+
+ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
+ bool "Wayland"
+- # libdrm needed by gbm_viv.so
+- select BR2_PACKAGE_LIBDRM
+ select BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+
+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 802ac26c1c..103c0341e3 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -29,8 +29,13 @@ ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
+ IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes
+ endif
+
++# Libraries are linked against libdrm, except framebuffer output on ARM
++ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby)
++IMX_GPU_VIV_DEPENDENCIES += libdrm
++endif
++
+ ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland)
+-IMX_GPU_VIV_DEPENDENCIES += libdrm wayland
++IMX_GPU_VIV_DEPENDENCIES += wayland
+ endif
+
+ define IMX_GPU_VIV_EXTRACT_CMDS
+--
+2.26.3
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 5f0cb0aa8..724d9d8f7 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -37,6 +37,7 @@ rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+rm -rf buildroot/package/freescale-imx/imx-gpu-viv/Config.in
rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
hooks/post-receive
--
armadeus
|