* [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard*
@ 2021-11-04 6:38 Giulio Benetti
2021-11-04 6:38 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti
` (2 more replies)
0 siblings, 3 replies; 29+ messages in thread
From: Giulio Benetti @ 2021-11-04 6:38 UTC (permalink / raw)
To: buildroot
Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni,
Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire
With this patchset I re-spin a part of a pending patchset[1] to rename
sunxi-mali-mainline* packages to sunxi-mali-utgard*. This clarifies which
kind of Allwinner(sunxi) Mali driver/blob we're dealing with and for the
future it makes more clear adding Rockchip Mali present in the same [1]
patchset I will take care of.
[1]: https://patchwork.ozlabs.org/project/buildroot/list/?series=162754
Miquel Raynal (2):
package/sunxi-mali-utgard: rename from sunxi-mali-mainline
package/sunxi-mali-utgard-driver: rename from
sunxi-mali-mainline-driver
Config.in.legacy | 42 ++++++++++++++++
DEVELOPERS | 4 +-
configs/olimex_a20_olinuxino_lime2_defconfig | 4 +-
configs/olimex_a20_olinuxino_lime_defconfig | 4 +-
docs/manual/adding-packages-virtual.txt | 2 +-
package/Config.in | 4 +-
package/glslsandbox-player/Config.in | 4 +-
.../glslsandbox-player/glslsandbox-player.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 2 +-
.../sunxi-mali-mainline-driver.mk | 41 ----------------
package/sunxi-mali-mainline/Config.in | 42 ----------------
.../sunxi-mali-mainline.mk | 49 -------------------
.../Config.in | 20 ++++----
.../sunxi-mali-utgard-driver.hash} | 2 +-
.../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++
package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++
.../egl.pc | 0
.../glesv2.pc | 0
.../sunxi-mali-utgard.hash} | 2 +-
.../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++
20 files changed, 200 insertions(+), 157 deletions(-)
delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
delete mode 100644 package/sunxi-mali-mainline/Config.in
delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk
rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%)
rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%)
create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk
create mode 100644 package/sunxi-mali-utgard/Config.in
rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%)
rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%)
rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%)
create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-04 6:38 [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti @ 2021-11-04 6:38 ` Giulio Benetti 2021-11-04 9:26 ` Luca Ceresoli 2021-11-04 6:38 ` [Buildroot] [PATCH 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti 2021-11-04 6:40 ` [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2 siblings, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 6:38 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire From: Miquel Raynal <miquel.raynal@bootlin.com> This package provides Mali libraries for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing these libraries. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline into sunxi-mali-utgard. Add a legacy entry. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in sunxi-mali-mainline-driver/Config.in to respect bisectability] --- Config.in.legacy | 30 ++++++++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 2 +- package/glslsandbox-player/Config.in | 4 +- .../glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/sunxi-mali-mainline-driver/Config.in | 4 +- .../sunxi-mali-mainline-driver.mk | 6 +-- package/sunxi-mali-mainline/Config.in | 42 ---------------- .../sunxi-mali-mainline.mk | 49 ------------------- package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ 18 files changed, 137 insertions(+), 106 deletions(-) delete mode 100644 package/sunxi-mali-mainline/Config.in delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk create mode 100644 package/sunxi-mali-utgard/Config.in rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk diff --git a/Config.in.legacy b/Config.in.legacy index 24d0dc1d51..a209537423 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,36 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD + help + Since the removal of the sunxi-mali package, the + sunxi-mali-mainline package that coexisted became the only + package to provide Mali blobs. The "-mainline" suffix being + undescriptive nowadays and before adding new packages bringing + Mali support for other SoCs/GPU flavors, it is clearer to + rename it SUNXI_MALI_UTGARD. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "sunxi-mali-mainline-r6p2 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 + bool "sunxi-mali-mainline-r8p1 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + comment "Legacy options removed in 2021.11" config BR2_PACKAGE_MROUTED_RSRR diff --git a/DEVELOPERS b/DEVELOPERS index efc7344856..6f3afd639d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/sunxi-mali-utgard/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ed279326bc..d0ebeb53a3 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index cd88a2d19a..000071b11c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index 6326bb5455..722e6e3771 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -13,7 +13,7 @@ the provider used in the rootfs. For example, 'OpenGL ES' is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the 'Allwinner Tech Sunxi' and the 'Texas Instruments OMAP35xx' platforms. So +libgles+ will be a virtual -package and +sunxi-mali+ and +ti-gfx+ will be the providers. +package and +sunxi-mali-utgard+ and +ti-gfx+ will be the providers. ==== +virtual-package+ tutorial diff --git a/package/Config.in b/package/Config.in index c23755a421..1006161497 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" + source "package/sunxi-mali-utgard/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 02d4c442ed..2d15a7e270 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -55,7 +55,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS choice prompt "Native windowing system" - default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_UTGARD default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X if BR2_PACKAGE_MALI_T76X default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES @@ -73,7 +73,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI bool "Allwinner ARM/Mali Frame Buffer" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X bool "ARM/Mali T76x Frame Buffer" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index 1578608a42..c5fbf062b7 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) -GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += mali-t76x diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..7c52b7a0fe 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -262,7 +262,7 @@ endif ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 90bc308bc5..236470db53 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -1,11 +1,11 @@ comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver" default y - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index feffaa7ae6..6782ca7fc2 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -15,7 +15,7 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ KDIR=$(LINUX_DIR) define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ $(@D)/build.sh endef @@ -24,12 +24,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in deleted file mode 100644 index a2fb95bd79..0000000000 --- a/package/sunxi-mali-mainline/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI_MAINLINE - bool "sunxi-mali-mainline" - depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - help - Install userspace Allwinner OpenGL libraries. - - https://github.com/bootlin/mali-blobs - -if BR2_PACKAGE_SUNXI_MALI_MAINLINE - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali-mainline" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali-mainline" - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - help - Select the version of the userspace module. - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - bool "r6p2" -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - bool "r8p1" - -endchoice - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION - string - default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk deleted file mode 100644 index b46f572311..0000000000 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline -# -################################################################################ - -SUNXI_MALI_MAINLINE_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d -SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) -SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES -SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles -SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement -SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf -SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf -SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) - -SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) - -ifeq ($(BR2_arm),y) -SUNXI_MALI_MAINLINE_ARCH=arm -else ifeq ($(BR2_aarch64),y) -SUNXI_MALI_MAINLINE_ARCH=arm64 -endif - -define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ - - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(TARGET_DIR)/usr/lib/ -endef - -define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) -endef - -SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in new file mode 100644 index 0000000000..ff49ea03f1 --- /dev/null +++ b/package/sunxi-mali-utgard/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_SUNXI_MALI_UTGARD + bool "sunxi-mali-utgard" + depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries for Mali + Utgard GPUs. + + https://github.com/bootlin/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_UTGARD + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-utgard" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-utgard" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + bool "r6p2" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + bool "r8p1" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + +endif + +comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-utgard/egl.pc similarity index 100% rename from package/sunxi-mali-mainline/egl.pc rename to package/sunxi-mali-utgard/egl.pc diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-utgard/glesv2.pc similarity index 100% rename from package/sunxi-mali-mainline/glesv2.pc rename to package/sunxi-mali-utgard/glesv2.pc diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash similarity index 70% rename from package/sunxi-mali-mainline/sunxi-mali-mainline.hash rename to package/sunxi-mali-utgard/sunxi-mali-utgard.hash index 96d8251f16..c86b927ea5 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-mainline-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz +sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-utgard-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk new file mode 100644 index 0000000000..f693667955 --- /dev/null +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# sunxi-mali-utgard +# +################################################################################ + +SUNXI_MALI_UTGARD_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d +SUNXI_MALI_UTGARD_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_UTGARD_VERSION)) +SUNXI_MALI_UTGARD_INSTALL_STAGING = YES +SUNXI_MALI_UTGARD_PROVIDES = libegl libgles +SUNXI_MALI_UTGARD_LICENSE = Allwinner End User Licence Agreement +SUNXI_MALI_UTGARD_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf +SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf +SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) + +SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) + +ifeq ($(BR2_arm),y) +SUNXI_MALI_UTGARD_ARCH=arm +else ifeq ($(BR2_aarch64),y) +SUNXI_MALI_UTGARD_ARCH=arm64 +endif + +define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(TARGET_DIR)/usr/lib/ +endef + +define SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + mv $(@D)/$(SUNXI_MALI_UTGARD_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_UTGARD_EULA_NO_SPACES) +endef + +SUNXI_MALI_UTGARD_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + +$(eval $(generic-package)) -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-04 6:38 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti @ 2021-11-04 9:26 ` Luca Ceresoli 2021-11-04 17:23 ` [Buildroot] [PATCH v2 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2021-11-04 17:23 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 0 siblings, 2 replies; 29+ messages in thread From: Luca Ceresoli @ 2021-11-04 9:26 UTC (permalink / raw) To: Giulio Benetti, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Thomas De Schampheleire Hi Giulio, thanks for these and the other olimex patches you are sending. Thomas applied them faster than I could review and test them... let me try this time :) On 04/11/21 07:38, Giulio Benetti wrote: > From: Miquel Raynal <miquel.raynal@bootlin.com> > > This package provides Mali libraries for Sunxi Mali Utgard GPUs. The > trailing -mainline is historical and was used at a time when there was > two packages providing these libraries. The "non-upstream" package has > been removed some time ago so before adding new packages bringing > support for other ARM Mali GPU versions or implementations, rename > sunxi-mali-mainline into sunxi-mali-utgard. > > Add a legacy entry. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to > SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and > BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in > sunxi-mali-mainline-driver/Config.in to respect bisectability] [...] > diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig > index ed279326bc..d0ebeb53a3 100644 > --- a/configs/olimex_a20_olinuxino_lime2_defconfig > +++ b/configs/olimex_a20_olinuxino_lime2_defconfig > @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # sunxi packages > BR2_PACKAGE_SUNXI_TOOLS=y > -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y > +BR2_PACKAGE_SUNXI_MALI_UTGARD=y > BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y > > # Filesystem > diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig > index cd88a2d19a..000071b11c 100644 > --- a/configs/olimex_a20_olinuxino_lime_defconfig > +++ b/configs/olimex_a20_olinuxino_lime_defconfig > @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # sunxi packages > BR2_PACKAGE_SUNXI_TOOLS=y > -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y > +BR2_PACKAGE_SUNXI_MALI_UTGARD=y > BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y > > # Filesystem Both lime defconfigs still have this line: # glibc is needed for sunxi-mali-mainline-package. which sould be updated. While there, please change replace "-package" -> " package". The rest looks good. -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* 2021-11-04 9:26 ` Luca Ceresoli @ 2021-11-04 17:23 ` Giulio Benetti 2021-11-04 17:23 ` [Buildroot] [PATCH v2 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-04 17:23 ` [Buildroot] [PATCH v2 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti 2021-11-04 17:23 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 1 sibling, 2 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 17:23 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire With this patchset I re-spin a part of a pending patchset[1] to rename sunxi-mali-mainline* packages to sunxi-mali-utgard*. This clarifies which kind of Allwinner(sunxi) Mali driver/blob we're dealing with and for the future it makes more clear adding Rockchip Mali present in the same [1] patchset I will take care of. [1]: https://patchwork.ozlabs.org/project/buildroot/list/?series=162754 V1->V2: * fix defconfig comment on patch [1/2] Miquel Raynal (2): package/sunxi-mali-utgard: rename from sunxi-mali-mainline package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Config.in.legacy | 42 ++++++++++++++++ DEVELOPERS | 4 +- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +-- configs/olimex_a20_olinuxino_lime_defconfig | 6 +-- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 4 +- package/glslsandbox-player/Config.in | 4 +- .../glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ---------------- package/sunxi-mali-mainline/Config.in | 42 ---------------- .../sunxi-mali-mainline.mk | 49 ------------------- .../Config.in | 20 ++++---- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ 20 files changed, 202 insertions(+), 159 deletions(-) delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk delete mode 100644 package/sunxi-mali-mainline/Config.in delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk create mode 100644 package/sunxi-mali-utgard/Config.in rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-04 17:23 ` [Buildroot] [PATCH v2 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti @ 2021-11-04 17:23 ` Giulio Benetti 2021-11-05 11:04 ` Luca Ceresoli 2021-11-04 17:23 ` [Buildroot] [PATCH v2 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti 1 sibling, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 17:23 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire From: Miquel Raynal <miquel.raynal@bootlin.com> This package provides Mali libraries for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing these libraries. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline into sunxi-mali-utgard. Add a legacy entry. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in sunxi-mali-mainline-driver/Config.in to respect bisectability] --- V1->V2: * rename comments' in defconfig from "sunxi-mali-mainline-package" to "sunxi-mali-utgard package" as suggested by Luca Ceresoli --- Config.in.legacy | 30 ++++++++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 4 +- configs/olimex_a20_olinuxino_lime_defconfig | 4 +- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 2 +- package/glslsandbox-player/Config.in | 4 +- .../glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/sunxi-mali-mainline-driver/Config.in | 4 +- .../sunxi-mali-mainline-driver.mk | 6 +-- package/sunxi-mali-mainline/Config.in | 42 ---------------- .../sunxi-mali-mainline.mk | 49 ------------------- package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ 18 files changed, 139 insertions(+), 108 deletions(-) delete mode 100644 package/sunxi-mali-mainline/Config.in delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk create mode 100644 package/sunxi-mali-utgard/Config.in rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk diff --git a/Config.in.legacy b/Config.in.legacy index 24d0dc1d51..a209537423 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,36 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD + help + Since the removal of the sunxi-mali package, the + sunxi-mali-mainline package that coexisted became the only + package to provide Mali blobs. The "-mainline" suffix being + undescriptive nowadays and before adding new packages bringing + Mali support for other SoCs/GPU flavors, it is clearer to + rename it SUNXI_MALI_UTGARD. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "sunxi-mali-mainline-r6p2 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 + bool "sunxi-mali-mainline-r8p1 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + comment "Legacy options removed in 2021.11" config BR2_PACKAGE_MROUTED_RSRR diff --git a/DEVELOPERS b/DEVELOPERS index efc7344856..6f3afd639d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/sunxi-mali-utgard/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ed279326bc..319ac48c58 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index cd88a2d19a..4cec5689ca 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index 6326bb5455..722e6e3771 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -13,7 +13,7 @@ the provider used in the rootfs. For example, 'OpenGL ES' is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the 'Allwinner Tech Sunxi' and the 'Texas Instruments OMAP35xx' platforms. So +libgles+ will be a virtual -package and +sunxi-mali+ and +ti-gfx+ will be the providers. +package and +sunxi-mali-utgard+ and +ti-gfx+ will be the providers. ==== +virtual-package+ tutorial diff --git a/package/Config.in b/package/Config.in index c23755a421..1006161497 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" + source "package/sunxi-mali-utgard/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 02d4c442ed..2d15a7e270 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -55,7 +55,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS choice prompt "Native windowing system" - default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_UTGARD default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X if BR2_PACKAGE_MALI_T76X default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES @@ -73,7 +73,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI bool "Allwinner ARM/Mali Frame Buffer" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X bool "ARM/Mali T76x Frame Buffer" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index 1578608a42..c5fbf062b7 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) -GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += mali-t76x diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..7c52b7a0fe 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -262,7 +262,7 @@ endif ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 90bc308bc5..236470db53 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -1,11 +1,11 @@ comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver" default y - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index feffaa7ae6..6782ca7fc2 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -15,7 +15,7 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ KDIR=$(LINUX_DIR) define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ $(@D)/build.sh endef @@ -24,12 +24,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in deleted file mode 100644 index a2fb95bd79..0000000000 --- a/package/sunxi-mali-mainline/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI_MAINLINE - bool "sunxi-mali-mainline" - depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - help - Install userspace Allwinner OpenGL libraries. - - https://github.com/bootlin/mali-blobs - -if BR2_PACKAGE_SUNXI_MALI_MAINLINE - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali-mainline" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali-mainline" - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - help - Select the version of the userspace module. - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - bool "r6p2" -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - bool "r8p1" - -endchoice - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION - string - default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk deleted file mode 100644 index b46f572311..0000000000 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline -# -################################################################################ - -SUNXI_MALI_MAINLINE_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d -SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) -SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES -SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles -SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement -SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf -SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf -SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) - -SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) - -ifeq ($(BR2_arm),y) -SUNXI_MALI_MAINLINE_ARCH=arm -else ifeq ($(BR2_aarch64),y) -SUNXI_MALI_MAINLINE_ARCH=arm64 -endif - -define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ - - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(TARGET_DIR)/usr/lib/ -endef - -define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) -endef - -SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in new file mode 100644 index 0000000000..ff49ea03f1 --- /dev/null +++ b/package/sunxi-mali-utgard/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_SUNXI_MALI_UTGARD + bool "sunxi-mali-utgard" + depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries for Mali + Utgard GPUs. + + https://github.com/bootlin/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_UTGARD + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-utgard" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-utgard" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + bool "r6p2" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + bool "r8p1" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + +endif + +comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-utgard/egl.pc similarity index 100% rename from package/sunxi-mali-mainline/egl.pc rename to package/sunxi-mali-utgard/egl.pc diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-utgard/glesv2.pc similarity index 100% rename from package/sunxi-mali-mainline/glesv2.pc rename to package/sunxi-mali-utgard/glesv2.pc diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash similarity index 70% rename from package/sunxi-mali-mainline/sunxi-mali-mainline.hash rename to package/sunxi-mali-utgard/sunxi-mali-utgard.hash index 96d8251f16..c86b927ea5 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-mainline-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz +sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-utgard-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk new file mode 100644 index 0000000000..f693667955 --- /dev/null +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# sunxi-mali-utgard +# +################################################################################ + +SUNXI_MALI_UTGARD_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d +SUNXI_MALI_UTGARD_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_UTGARD_VERSION)) +SUNXI_MALI_UTGARD_INSTALL_STAGING = YES +SUNXI_MALI_UTGARD_PROVIDES = libegl libgles +SUNXI_MALI_UTGARD_LICENSE = Allwinner End User Licence Agreement +SUNXI_MALI_UTGARD_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf +SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf +SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) + +SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) + +ifeq ($(BR2_arm),y) +SUNXI_MALI_UTGARD_ARCH=arm +else ifeq ($(BR2_aarch64),y) +SUNXI_MALI_UTGARD_ARCH=arm64 +endif + +define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(TARGET_DIR)/usr/lib/ +endef + +define SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + mv $(@D)/$(SUNXI_MALI_UTGARD_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_UTGARD_EULA_NO_SPACES) +endef + +SUNXI_MALI_UTGARD_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + +$(eval $(generic-package)) -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-04 17:23 ` [Buildroot] [PATCH v2 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti @ 2021-11-05 11:04 ` Luca Ceresoli 0 siblings, 0 replies; 29+ messages in thread From: Luca Ceresoli @ 2021-11-05 11:04 UTC (permalink / raw) To: Giulio Benetti, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Thomas De Schampheleire Hi, On 04/11/21 18:23, Giulio Benetti wrote: > From: Miquel Raynal <miquel.raynal@bootlin.com> > > This package provides Mali libraries for Sunxi Mali Utgard GPUs. The > trailing -mainline is historical and was used at a time when there was > two packages providing these libraries. The "non-upstream" package has > been removed some time ago so before adding new packages bringing > support for other ARM Mali GPU versions or implementations, rename > sunxi-mali-mainline into sunxi-mali-utgard. > > Add a legacy entry. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to > SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and > BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in > sunxi-mali-mainline-driver/Config.in to respect bisectability] [Build tested only] Tested-by: Luca Ceresoli <luca@lucaceresoli.net> Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver 2021-11-04 17:23 ` [Buildroot] [PATCH v2 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2021-11-04 17:23 ` [Buildroot] [PATCH v2 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti @ 2021-11-04 17:23 ` Giulio Benetti 2021-11-05 11:04 ` Luca Ceresoli 1 sibling, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 17:23 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire From: Miquel Raynal <miquel.raynal@bootlin.com> This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing this driver. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. Add a legacy entry. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> [Giulio: rebase on master. Add legacy entry instead of substituting the blob's one] Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> --- Config.in.legacy | 12 ++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- package/Config.in | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ------------------- .../Config.in | 16 ++++---- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 +++++++++++++++++++ 9 files changed, 66 insertions(+), 54 deletions(-) delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (67%) rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk diff --git a/Config.in.legacy b/Config.in.legacy index a209537423..1aac28382a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,18 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + help + Since the removal of the sunxi-mali-driver package, the + sunxi-mali-mainline-driver package that coexisted became the + only package to provide the Sunxi Mali driver. The "-mainline" + suffix being undescriptive nowadays and before adding new + packages bringing Mali support for other SoCs/GPU flavors, it + is clearer to rename it SUNXI_MALI_UTGARD_DRIVER. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE bool "sunxi-mali-mainline package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6f3afd639d..46b294852a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-utgard/ +F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 319ac48c58..64a66de5c8 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 4cec5689ca..17da786a8c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/package/Config.in b/package/Config.in index 1006161497..9201376dcf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline-driver/Config.in" source "package/sunxi-mali-utgard/Config.in" + source "package/sunxi-mali-utgard-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk deleted file mode 100644 index 6782ca7fc2..0000000000 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline-driver -# -################################################################################ - -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) -SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux -SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 -SUNXI_MALI_MAINLINE_DRIVER_LICENSE_FILES = LICENSE - -SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ - $(LINUX_MAKE_FLAGS) \ - KDIR=$(LINUX_DIR) - -define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh -endef - -SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - -define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b -endef - -define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i -endef - -define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) -endef - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in similarity index 67% rename from package/sunxi-mali-mainline-driver/Config.in rename to package/sunxi-mali-utgard-driver/Config.in index 236470db53..244283f44d 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -1,22 +1,22 @@ -comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" +comment "sunxi-mali-utgard-driver needs a Linux kernel to be built" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - bool "sunxi-mali-mainline-driver" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + bool "sunxi-mali-utgard-driver" default y depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help This package builds and installs the Linux kernel driver for - the Mali GPU on Allwinner platforms, compatible with recent - Linux kernels (>= 4.4). Note that it should be installed - together with the corresponding userspace OpenGL libraries, - which are provided as binaries only at: + the Mali Utgard GPU on Allwinner platforms, compatible with + recent Linux kernels (>= 4.4). Note that it should be + installed together with the corresponding userspace OpenGL + libraries, which are provided as binaries only at: https://github.com/bootlin/mali-blobs - sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + sunxi-mali-utgard-driver requires a Linux kernel >= 4.4 with the following options enabled: - CONFIG_CMA diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash similarity index 66% rename from package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash rename to package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index f08e80f114..4b276fecb7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk new file mode 100644 index 0000000000..5f9090f492 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# sunxi-mali-utgard-driver +# +################################################################################ + +SUNXI_MALI_UTGARD_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux +SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 +SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE + +SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ + $(LINUX_MAKE_FLAGS) \ + KDIR=$(LINUX_DIR) + +define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + +define SUNXI_MALI_UTGARD_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b +endef + +define SUNXI_MALI_UTGARD_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i +endef + +define SUNXI_MALI_UTGARD_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + +$(eval $(generic-package)) -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver 2021-11-04 17:23 ` [Buildroot] [PATCH v2 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti @ 2021-11-05 11:04 ` Luca Ceresoli 0 siblings, 0 replies; 29+ messages in thread From: Luca Ceresoli @ 2021-11-05 11:04 UTC (permalink / raw) To: Giulio Benetti, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Thomas De Schampheleire Hi, On 04/11/21 18:23, Giulio Benetti wrote: > From: Miquel Raynal <miquel.raynal@bootlin.com> > > This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The > trailing -mainline is historical and was used at a time when there was > two packages providing this driver. The "non-upstream" package has > been removed some time ago so before adding new packages bringing > support for other ARM Mali GPU versions or implementations, rename > sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. > > Add a legacy entry. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > [Giulio: rebase on master. Add legacy entry instead of substituting the > blob's one] > Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> [Build tested only] Tested-by: Luca Ceresoli <luca@lucaceresoli.net> -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-04 9:26 ` Luca Ceresoli 2021-11-04 17:23 ` [Buildroot] [PATCH v2 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti @ 2021-11-04 17:23 ` Giulio Benetti 2021-11-05 11:04 ` Luca Ceresoli 1 sibling, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 17:23 UTC (permalink / raw) To: Luca Ceresoli, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Thomas De Schampheleire Hi Luca, On 11/4/21 10:26 AM, Luca Ceresoli wrote: > Hi Giulio, > > thanks for these and the other olimex patches you are sending. Thomas > applied them faster than I could review and test them... let me try this > time :) I've just sent the v2 series, do we wait until you give a Tested-by: ? Thanks for reviewing! -- Giulio Benetti Benetti Engineering sas > On 04/11/21 07:38, Giulio Benetti wrote: >> From: Miquel Raynal <miquel.raynal@bootlin.com> >> >> This package provides Mali libraries for Sunxi Mali Utgard GPUs. The >> trailing -mainline is historical and was used at a time when there was >> two packages providing these libraries. The "non-upstream" package has >> been removed some time ago so before adding new packages bringing >> support for other ARM Mali GPU versions or implementations, rename >> sunxi-mali-mainline into sunxi-mali-utgard. >> >> Add a legacy entry. >> >> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> >> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> >> [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to >> SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and >> BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in >> sunxi-mali-mainline-driver/Config.in to respect bisectability] > > [...] > >> diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig >> index ed279326bc..d0ebeb53a3 100644 >> --- a/configs/olimex_a20_olinuxino_lime2_defconfig >> +++ b/configs/olimex_a20_olinuxino_lime2_defconfig >> @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y >> >> # sunxi packages >> BR2_PACKAGE_SUNXI_TOOLS=y >> -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y >> +BR2_PACKAGE_SUNXI_MALI_UTGARD=y >> BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y >> >> # Filesystem >> diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig >> index cd88a2d19a..000071b11c 100644 >> --- a/configs/olimex_a20_olinuxino_lime_defconfig >> +++ b/configs/olimex_a20_olinuxino_lime_defconfig >> @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y >> >> # sunxi packages >> BR2_PACKAGE_SUNXI_TOOLS=y >> -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y >> +BR2_PACKAGE_SUNXI_MALI_UTGARD=y >> BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y >> >> # Filesystem > > Both lime defconfigs still have this line: > > # glibc is needed for sunxi-mali-mainline-package. > > which sould be updated. > > While there, please change replace "-package" -> " package". > > The rest looks good. > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-04 17:23 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti @ 2021-11-05 11:04 ` Luca Ceresoli 2021-11-05 13:24 ` Giulio Benetti 0 siblings, 1 reply; 29+ messages in thread From: Luca Ceresoli @ 2021-11-05 11:04 UTC (permalink / raw) To: Giulio Benetti, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Thomas De Schampheleire Hi Giulio, On 04/11/21 18:23, Giulio Benetti wrote: > Hi Luca, > > On 11/4/21 10:26 AM, Luca Ceresoli wrote: >> Hi Giulio, >> >> thanks for these and the other olimex patches you are sending. Thomas >> applied them faster than I could review and test them... let me try this >> time :) > > I've just sent the v2 series, do we wait until you give a Tested-by: ? Just sent my Tested-by too, but I only build tested since I have no lime board. -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-05 11:04 ` Luca Ceresoli @ 2021-11-05 13:24 ` Giulio Benetti 2021-11-05 15:46 ` Luca Ceresoli 0 siblings, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 13:24 UTC (permalink / raw) To: Luca Ceresoli Cc: Miquel Raynal, Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, buildroot, Thomas De Schampheleire Hi Luca, > Il giorno 5 nov 2021, alle ore 12:05, Luca Ceresoli <luca@lucaceresoli.net> ha scritto: > > Hi Giulio, > >> On 04/11/21 18:23, Giulio Benetti wrote: >> Hi Luca, >> >>> On 11/4/21 10:26 AM, Luca Ceresoli wrote: >>> Hi Giulio, >>> >>> thanks for these and the other olimex patches you are sending. Thomas >>> applied them faster than I could review and test them... let me try this >>> time :) >> >> I've just sent the v2 series, do we wait until you give a Tested-by: ? > > Just sent my Tested-by too, but I only build tested since I have no lime > board. Have you’ve given a try on lime2 at least? Otherwise I can. Giulio > > -- > Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-05 13:24 ` Giulio Benetti @ 2021-11-05 15:46 ` Luca Ceresoli 2021-11-05 17:08 ` Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 0 siblings, 2 replies; 29+ messages in thread From: Luca Ceresoli @ 2021-11-05 15:46 UTC (permalink / raw) To: Giulio Benetti Cc: Miquel Raynal, Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, buildroot, Thomas De Schampheleire Hi Giulio, On 05/11/21 14:24, Giulio Benetti wrote: > Hi Luca, > >> Il giorno 5 nov 2021, alle ore 12:05, Luca Ceresoli <luca@lucaceresoli.net> ha scritto: >> >> Hi Giulio, >> >>> On 04/11/21 18:23, Giulio Benetti wrote: >>> Hi Luca, >>> >>>> On 11/4/21 10:26 AM, Luca Ceresoli wrote: >>>> Hi Giulio, >>>> >>>> thanks for these and the other olimex patches you are sending. Thomas >>>> applied them faster than I could review and test them... let me try this >>>> time :) >>> >>> I've just sent the v2 series, do we wait until you give a Tested-by: ? >> >> Just sent my Tested-by too, but I only build tested since I have no lime >> board. > > Have you’ve given a try on lime2 at least? No, apologies, I don't have any "lime*" board... no lime, no lime2. I have only an A20 micro but it has no MALI defconfig in Buildroot and so it doesn't appear in this series. -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-05 15:46 ` Luca Ceresoli @ 2021-11-05 17:08 ` Giulio Benetti 2021-11-05 18:59 ` Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 1 sibling, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 17:08 UTC (permalink / raw) To: Luca Ceresoli Cc: Miquel Raynal, Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, buildroot, Thomas De Schampheleire > Il giorno 5 nov 2021, alle ore 16:46, Luca Ceresoli <luca@lucaceresoli.net> ha scritto: > > Hi Giulio, > >> On 05/11/21 14:24, Giulio Benetti wrote: >> Hi Luca, >> >>>> Il giorno 5 nov 2021, alle ore 12:05, Luca Ceresoli <luca@lucaceresoli.net> ha scritto: >>> >>> Hi Giulio, >>> >>>> On 04/11/21 18:23, Giulio Benetti wrote: >>>> Hi Luca, >>>> >>>>> On 11/4/21 10:26 AM, Luca Ceresoli wrote: >>>>> Hi Giulio, >>>>> >>>>> thanks for these and the other olimex patches you are sending. Thomas >>>>> applied them faster than I could review and test them... let me try this >>>>> time :) >>>> >>>> I've just sent the v2 series, do we wait until you give a Tested-by: ? >>> >>> Just sent my Tested-by too, but I only build tested since I have no lime >>> board. >> >> Have you’ve given a try on lime2 at least? > > No, apologies, I don't have any "lime*" board... no lime, no lime2. > > I have only an A20 micro but it has no MALI defconfig in Buildroot and > so it doesn't appear in this series. Ok, no problem, I give a try then :-) Best regards Giulio > > -- > Luca > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-05 17:08 ` Giulio Benetti @ 2021-11-05 18:59 ` Giulio Benetti 0 siblings, 0 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 18:59 UTC (permalink / raw) To: Luca Ceresoli Cc: Miquel Raynal, Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, buildroot, Thomas De Schampheleire Hi Luca, On 11/5/21 6:08 PM, Giulio Benetti wrote: > >> Il giorno 5 nov 2021, alle ore 16:46, Luca Ceresoli <luca@lucaceresoli.net> ha scritto: >> >> Hi Giulio, >> >>> On 05/11/21 14:24, Giulio Benetti wrote: >>> Hi Luca, >>> >>>>> Il giorno 5 nov 2021, alle ore 12:05, Luca Ceresoli <luca@lucaceresoli.net> ha scritto: >>>> >>>> Hi Giulio, >>>> >>>>> On 04/11/21 18:23, Giulio Benetti wrote: >>>>> Hi Luca, >>>>> >>>>>> On 11/4/21 10:26 AM, Luca Ceresoli wrote: >>>>>> Hi Giulio, >>>>>> >>>>>> thanks for these and the other olimex patches you are sending. Thomas >>>>>> applied them faster than I could review and test them... let me try this >>>>>> time :) >>>>> >>>>> I've just sent the v2 series, do we wait until you give a Tested-by: ? >>>> >>>> Just sent my Tested-by too, but I only build tested since I have no lime >>>> board. >>> >>> Have you’ve given a try on lime2 at least? >> >> No, apologies, I don't have any "lime*" board... no lime, no lime2. >> >> I have only an A20 micro but it has no MALI defconfig in Buildroot and >> so it doesn't appear in this series. > > Ok, no problem, I give a try then :-) I've just tested, on my recent previous linux/u-boot bump I didn't see that Lima is enabled by default in Linux sunxi_defconfig so on next iteraion I'm going to send another patch that adds a linux.fragment to disable Lima in favour of Mali. Then the choice of using Lima+Mesa3d is a user decision. Best regards -- Giulio Benetti Benetti Engineering sas _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading 2021-11-05 15:46 ` Luca Ceresoli 2021-11-05 17:08 ` Giulio Benetti @ 2021-11-05 22:17 ` Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 1/5] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti ` (6 more replies) 1 sibling, 7 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:17 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire With this patchset I respin the first 2 patches. While testing on hardware the patches they work, but I've left back an error while bumping linux version to 5.14. The error is that Linux's sunxi_defconfig(used by both a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want to use Mali driver, so when Mali driver tries to load(being it a module), it finds that Lima already has taken gpu resources and fail. So here I add 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 to use that fragment in a20_olinuxino_lime/2. Giulio Benetti (3): board/olimex/a20_olinuxino: add linux-disable-lima.fragment configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment Miquel Raynal (2): package/sunxi-mali-utgard: rename from sunxi-mali-mainline package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Config.in.legacy | 42 ++++++++++++++++ DEVELOPERS | 4 +- .../a20_olinuxino/linux-disable-lima.fragment | 2 + configs/olimex_a20_olinuxino_lime2_defconfig | 7 +-- configs/olimex_a20_olinuxino_lime_defconfig | 7 +-- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 4 +- package/glslsandbox-player/Config.in | 4 +- .../glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ---------------- package/sunxi-mali-mainline/Config.in | 42 ---------------- .../sunxi-mali-mainline.mk | 49 ------------------- .../Config.in | 20 ++++---- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ 21 files changed, 206 insertions(+), 159 deletions(-) create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk delete mode 100644 package/sunxi-mali-mainline/Config.in delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk create mode 100644 package/sunxi-mali-utgard/Config.in rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 1/5] package/sunxi-mali-utgard: rename from sunxi-mali-mainline 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti @ 2021-11-05 22:17 ` Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 2/5] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti ` (5 subsequent siblings) 6 siblings, 0 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:17 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire From: Miquel Raynal <miquel.raynal@bootlin.com> This package provides Mali libraries for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing these libraries. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline into sunxi-mali-utgard. Add a legacy entry. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in sunxi-mali-mainline-driver/Config.in to respect bisectability] Tested-by: Luca Ceresoli <luca@lucaceresoli.net> [Build tested only] Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> --- Config.in.legacy | 30 ++++++++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 4 +- configs/olimex_a20_olinuxino_lime_defconfig | 4 +- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 2 +- package/glslsandbox-player/Config.in | 4 +- .../glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/sunxi-mali-mainline-driver/Config.in | 4 +- .../sunxi-mali-mainline-driver.mk | 6 +-- package/sunxi-mali-mainline/Config.in | 42 ---------------- .../sunxi-mali-mainline.mk | 49 ------------------- package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ 18 files changed, 139 insertions(+), 108 deletions(-) delete mode 100644 package/sunxi-mali-mainline/Config.in delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk create mode 100644 package/sunxi-mali-utgard/Config.in rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk diff --git a/Config.in.legacy b/Config.in.legacy index 24d0dc1d51..a209537423 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,36 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD + help + Since the removal of the sunxi-mali package, the + sunxi-mali-mainline package that coexisted became the only + package to provide Mali blobs. The "-mainline" suffix being + undescriptive nowadays and before adding new packages bringing + Mali support for other SoCs/GPU flavors, it is clearer to + rename it SUNXI_MALI_UTGARD. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "sunxi-mali-mainline-r6p2 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 + bool "sunxi-mali-mainline-r8p1 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + comment "Legacy options removed in 2021.11" config BR2_PACKAGE_MROUTED_RSRR diff --git a/DEVELOPERS b/DEVELOPERS index 9d0e92b564..7eda2cf197 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/sunxi-mali-utgard/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ed279326bc..319ac48c58 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index cd88a2d19a..4cec5689ca 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index 6326bb5455..722e6e3771 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -13,7 +13,7 @@ the provider used in the rootfs. For example, 'OpenGL ES' is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the 'Allwinner Tech Sunxi' and the 'Texas Instruments OMAP35xx' platforms. So +libgles+ will be a virtual -package and +sunxi-mali+ and +ti-gfx+ will be the providers. +package and +sunxi-mali-utgard+ and +ti-gfx+ will be the providers. ==== +virtual-package+ tutorial diff --git a/package/Config.in b/package/Config.in index c23755a421..1006161497 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" + source "package/sunxi-mali-utgard/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 02d4c442ed..2d15a7e270 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -55,7 +55,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS choice prompt "Native windowing system" - default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_UTGARD default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X if BR2_PACKAGE_MALI_T76X default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES @@ -73,7 +73,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI bool "Allwinner ARM/Mali Frame Buffer" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X bool "ARM/Mali T76x Frame Buffer" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index 1578608a42..c5fbf062b7 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) -GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += mali-t76x diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..7c52b7a0fe 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -262,7 +262,7 @@ endif ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 90bc308bc5..236470db53 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -1,11 +1,11 @@ comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver" default y - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index feffaa7ae6..6782ca7fc2 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -15,7 +15,7 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ KDIR=$(LINUX_DIR) define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ $(@D)/build.sh endef @@ -24,12 +24,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in deleted file mode 100644 index a2fb95bd79..0000000000 --- a/package/sunxi-mali-mainline/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI_MAINLINE - bool "sunxi-mali-mainline" - depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - help - Install userspace Allwinner OpenGL libraries. - - https://github.com/bootlin/mali-blobs - -if BR2_PACKAGE_SUNXI_MALI_MAINLINE - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali-mainline" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali-mainline" - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - help - Select the version of the userspace module. - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - bool "r6p2" -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - bool "r8p1" - -endchoice - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION - string - default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk deleted file mode 100644 index b46f572311..0000000000 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline -# -################################################################################ - -SUNXI_MALI_MAINLINE_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d -SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) -SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES -SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles -SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement -SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf -SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf -SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) - -SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) - -ifeq ($(BR2_arm),y) -SUNXI_MALI_MAINLINE_ARCH=arm -else ifeq ($(BR2_aarch64),y) -SUNXI_MALI_MAINLINE_ARCH=arm64 -endif - -define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ - - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(TARGET_DIR)/usr/lib/ -endef - -define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) -endef - -SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in new file mode 100644 index 0000000000..ff49ea03f1 --- /dev/null +++ b/package/sunxi-mali-utgard/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_SUNXI_MALI_UTGARD + bool "sunxi-mali-utgard" + depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries for Mali + Utgard GPUs. + + https://github.com/bootlin/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_UTGARD + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-utgard" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-utgard" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + bool "r6p2" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + bool "r8p1" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + +endif + +comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-utgard/egl.pc similarity index 100% rename from package/sunxi-mali-mainline/egl.pc rename to package/sunxi-mali-utgard/egl.pc diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-utgard/glesv2.pc similarity index 100% rename from package/sunxi-mali-mainline/glesv2.pc rename to package/sunxi-mali-utgard/glesv2.pc diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash similarity index 70% rename from package/sunxi-mali-mainline/sunxi-mali-mainline.hash rename to package/sunxi-mali-utgard/sunxi-mali-utgard.hash index 96d8251f16..c86b927ea5 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-mainline-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz +sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-utgard-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk new file mode 100644 index 0000000000..f693667955 --- /dev/null +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# sunxi-mali-utgard +# +################################################################################ + +SUNXI_MALI_UTGARD_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d +SUNXI_MALI_UTGARD_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_UTGARD_VERSION)) +SUNXI_MALI_UTGARD_INSTALL_STAGING = YES +SUNXI_MALI_UTGARD_PROVIDES = libegl libgles +SUNXI_MALI_UTGARD_LICENSE = Allwinner End User Licence Agreement +SUNXI_MALI_UTGARD_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf +SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf +SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) + +SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) + +ifeq ($(BR2_arm),y) +SUNXI_MALI_UTGARD_ARCH=arm +else ifeq ($(BR2_aarch64),y) +SUNXI_MALI_UTGARD_ARCH=arm64 +endif + +define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(TARGET_DIR)/usr/lib/ +endef + +define SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + mv $(@D)/$(SUNXI_MALI_UTGARD_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_UTGARD_EULA_NO_SPACES) +endef + +SUNXI_MALI_UTGARD_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + +$(eval $(generic-package)) -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 2/5] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 1/5] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti @ 2021-11-05 22:17 ` Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment Giulio Benetti ` (4 subsequent siblings) 6 siblings, 0 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:17 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire From: Miquel Raynal <miquel.raynal@bootlin.com> This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing this driver. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. Add a legacy entry. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> [Giulio: rebase on master. Add legacy entry instead of substituting the blob's one] Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> --- Config.in.legacy | 12 ++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- package/Config.in | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ------------------- .../Config.in | 16 ++++---- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 +++++++++++++++++++ 9 files changed, 66 insertions(+), 54 deletions(-) delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (67%) rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk diff --git a/Config.in.legacy b/Config.in.legacy index a209537423..1aac28382a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,18 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + help + Since the removal of the sunxi-mali-driver package, the + sunxi-mali-mainline-driver package that coexisted became the + only package to provide the Sunxi Mali driver. The "-mainline" + suffix being undescriptive nowadays and before adding new + packages bringing Mali support for other SoCs/GPU flavors, it + is clearer to rename it SUNXI_MALI_UTGARD_DRIVER. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE bool "sunxi-mali-mainline package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7eda2cf197..59bcf1ddc9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-utgard/ +F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 319ac48c58..64a66de5c8 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 4cec5689ca..17da786a8c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/package/Config.in b/package/Config.in index 1006161497..9201376dcf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline-driver/Config.in" source "package/sunxi-mali-utgard/Config.in" + source "package/sunxi-mali-utgard-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk deleted file mode 100644 index 6782ca7fc2..0000000000 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline-driver -# -################################################################################ - -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) -SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux -SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 -SUNXI_MALI_MAINLINE_DRIVER_LICENSE_FILES = LICENSE - -SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ - $(LINUX_MAKE_FLAGS) \ - KDIR=$(LINUX_DIR) - -define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh -endef - -SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - -define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b -endef - -define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i -endef - -define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) -endef - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in similarity index 67% rename from package/sunxi-mali-mainline-driver/Config.in rename to package/sunxi-mali-utgard-driver/Config.in index 236470db53..244283f44d 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -1,22 +1,22 @@ -comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" +comment "sunxi-mali-utgard-driver needs a Linux kernel to be built" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - bool "sunxi-mali-mainline-driver" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + bool "sunxi-mali-utgard-driver" default y depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help This package builds and installs the Linux kernel driver for - the Mali GPU on Allwinner platforms, compatible with recent - Linux kernels (>= 4.4). Note that it should be installed - together with the corresponding userspace OpenGL libraries, - which are provided as binaries only at: + the Mali Utgard GPU on Allwinner platforms, compatible with + recent Linux kernels (>= 4.4). Note that it should be + installed together with the corresponding userspace OpenGL + libraries, which are provided as binaries only at: https://github.com/bootlin/mali-blobs - sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + sunxi-mali-utgard-driver requires a Linux kernel >= 4.4 with the following options enabled: - CONFIG_CMA diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash similarity index 66% rename from package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash rename to package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index f08e80f114..4b276fecb7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk new file mode 100644 index 0000000000..5f9090f492 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# sunxi-mali-utgard-driver +# +################################################################################ + +SUNXI_MALI_UTGARD_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux +SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 +SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE + +SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ + $(LINUX_MAKE_FLAGS) \ + KDIR=$(LINUX_DIR) + +define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + +define SUNXI_MALI_UTGARD_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b +endef + +define SUNXI_MALI_UTGARD_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i +endef + +define SUNXI_MALI_UTGARD_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + +$(eval $(generic-package)) -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 1/5] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 2/5] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti @ 2021-11-05 22:17 ` Giulio Benetti 2022-01-08 14:10 ` Thomas Petazzoni 2021-11-05 22:17 ` [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment Giulio Benetti ` (3 subsequent siblings) 6 siblings, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:17 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire This Linux defconfig fragment is needed to disable Lima driver in favour of Mali(if enabled). This because Lima is enabled by default in Linux's sunxi_defconfig and if we enable Mali driver in Buildroot it will fail to load. So let's set CONFIG_DRM_LIMA=n. Of course this fragment is only used by Buildroot defconfigs that enable Mali driver. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- board/olimex/a20_olinuxino/linux-disable-lima.fragment | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment diff --git a/board/olimex/a20_olinuxino/linux-disable-lima.fragment b/board/olimex/a20_olinuxino/linux-disable-lima.fragment new file mode 100644 index 0000000000..a992902dda --- /dev/null +++ b/board/olimex/a20_olinuxino/linux-disable-lima.fragment @@ -0,0 +1,2 @@ +# Disable LIMA in favour of Mali +CONFIG_DRM_LIMA=n -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment 2021-11-05 22:17 ` [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment Giulio Benetti @ 2022-01-08 14:10 ` Thomas Petazzoni 0 siblings, 0 replies; 29+ messages in thread From: Thomas Petazzoni @ 2022-01-08 14:10 UTC (permalink / raw) To: Giulio Benetti Cc: Julien Olivain, Peter Seiderer, Julien Corjon, buildroot, Luca Ceresoli, Thomas De Schampheleire On Fri, 5 Nov 2021 23:17:58 +0100 Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > +CONFIG_DRM_LIMA=n Changed to: # CONFIG_DRM_LIMA is not set and applied. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti ` (2 preceding siblings ...) 2021-11-05 22:17 ` [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment Giulio Benetti @ 2021-11-05 22:17 ` Giulio Benetti 2022-01-08 14:10 ` Thomas Petazzoni 2021-11-05 22:18 ` [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: " Giulio Benetti ` (2 subsequent siblings) 6 siblings, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:17 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- configs/olimex_a20_olinuxino_lime2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 64a66de5c8..b46cf37433 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment 2021-11-05 22:17 ` [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment Giulio Benetti @ 2022-01-08 14:10 ` Thomas Petazzoni 0 siblings, 0 replies; 29+ messages in thread From: Thomas Petazzoni @ 2022-01-08 14:10 UTC (permalink / raw) To: Giulio Benetti Cc: Julien Olivain, Peter Seiderer, Julien Corjon, buildroot, Luca Ceresoli, Thomas De Schampheleire On Fri, 5 Nov 2021 23:17:59 +0100 Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > This defconfig enables sunxi-mali-mainline-driver so we need to disable > Lima in Linux to prevent Mali to not load. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > configs/olimex_a20_olinuxino_lime2_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti ` (3 preceding siblings ...) 2021-11-05 22:17 ` [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment Giulio Benetti @ 2021-11-05 22:18 ` Giulio Benetti 2022-01-08 14:10 ` Thomas Petazzoni 2021-11-05 22:20 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 2022-01-06 18:03 ` Arnout Vandecappelle 6 siblings, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:18 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- configs/olimex_a20_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 17da786a8c..698137e46c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment 2021-11-05 22:18 ` [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: " Giulio Benetti @ 2022-01-08 14:10 ` Thomas Petazzoni 0 siblings, 0 replies; 29+ messages in thread From: Thomas Petazzoni @ 2022-01-08 14:10 UTC (permalink / raw) To: Giulio Benetti Cc: Julien Olivain, Peter Seiderer, Julien Corjon, buildroot, Luca Ceresoli, Thomas De Schampheleire On Fri, 5 Nov 2021 23:18:00 +0100 Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > This defconfig enables sunxi-mali-mainline-driver so we need to disable > Lima in Linux to prevent Mali to not load. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > configs/olimex_a20_olinuxino_lime_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti ` (4 preceding siblings ...) 2021-11-05 22:18 ` [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: " Giulio Benetti @ 2021-11-05 22:20 ` Giulio Benetti 2022-01-06 18:03 ` Arnout Vandecappelle 6 siblings, 0 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-05 22:20 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Thomas De Schampheleire I've realized only now that this patchset had to be v3, sorry for the noise! Do I keep v2 as it is or do I resend? Best regards -- Giulio Benetti Benetti Engineering sas On 11/5/21 11:17 PM, Giulio Benetti wrote: > With this patchset I respin the first 2 patches. While testing on hardware > the patches they work, but I've left back an error while bumping linux > version to 5.14. The error is that Linux's sunxi_defconfig(used by both > a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want > to use Mali driver, so when Mali driver tries to load(being it a module), > it finds that Lima already has taken gpu resources and fail. So here I add > 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 > to use that fragment in a20_olinuxino_lime/2. > > Giulio Benetti (3): > board/olimex/a20_olinuxino: add linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime2_defconfig: use > linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime_defconfig: use > linux-disable-lima.fragment > > Miquel Raynal (2): > package/sunxi-mali-utgard: rename from sunxi-mali-mainline > package/sunxi-mali-utgard-driver: rename from > sunxi-mali-mainline-driver > > Config.in.legacy | 42 ++++++++++++++++ > DEVELOPERS | 4 +- > .../a20_olinuxino/linux-disable-lima.fragment | 2 + > configs/olimex_a20_olinuxino_lime2_defconfig | 7 +-- > configs/olimex_a20_olinuxino_lime_defconfig | 7 +-- > docs/manual/adding-packages-virtual.txt | 2 +- > package/Config.in | 4 +- > package/glslsandbox-player/Config.in | 4 +- > .../glslsandbox-player/glslsandbox-player.mk | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > .../sunxi-mali-mainline-driver.mk | 41 ---------------- > package/sunxi-mali-mainline/Config.in | 42 ---------------- > .../sunxi-mali-mainline.mk | 49 ------------------- > .../Config.in | 20 ++++---- > .../sunxi-mali-utgard-driver.hash} | 2 +- > .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ > package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ > .../egl.pc | 0 > .../glesv2.pc | 0 > .../sunxi-mali-utgard.hash} | 2 +- > .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ > 21 files changed, 206 insertions(+), 159 deletions(-) > create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment > delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk > delete mode 100644 package/sunxi-mali-mainline/Config.in > delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk > rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) > rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) > create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk > create mode 100644 package/sunxi-mali-utgard/Config.in > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) > rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) > create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti ` (5 preceding siblings ...) 2021-11-05 22:20 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti @ 2022-01-06 18:03 ` Arnout Vandecappelle 2022-01-06 22:24 ` Luca Ceresoli 6 siblings, 1 reply; 29+ messages in thread From: Arnout Vandecappelle @ 2022-01-06 18:03 UTC (permalink / raw) To: Giulio Benetti, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Thomas De Schampheleire On 05/11/2021 23:17, Giulio Benetti wrote: > With this patchset I respin the first 2 patches. While testing on hardware > the patches they work, but I've left back an error while bumping linux > version to 5.14. The error is that Linux's sunxi_defconfig(used by both > a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want > to use Mali driver, so when Mali driver tries to load(being it a module), > it finds that Lima already has taken gpu resources and fail. So here I add > 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 > to use that fragment in a20_olinuxino_lime/2. > > Giulio Benetti (3): > board/olimex/a20_olinuxino: add linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime2_defconfig: use > linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime_defconfig: use > linux-disable-lima.fragment > > Miquel Raynal (2): > package/sunxi-mali-utgard: rename from sunxi-mali-mainline > package/sunxi-mali-utgard-driver: rename from > sunxi-mali-mainline-driver I applied these two patches to master. Luca, your review was very much appreciated so if you could maybe review the rest of this series as well? :-) Regards, Arnout > > Config.in.legacy | 42 ++++++++++++++++ > DEVELOPERS | 4 +- > .../a20_olinuxino/linux-disable-lima.fragment | 2 + > configs/olimex_a20_olinuxino_lime2_defconfig | 7 +-- > configs/olimex_a20_olinuxino_lime_defconfig | 7 +-- > docs/manual/adding-packages-virtual.txt | 2 +- > package/Config.in | 4 +- > package/glslsandbox-player/Config.in | 4 +- > .../glslsandbox-player/glslsandbox-player.mk | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > .../sunxi-mali-mainline-driver.mk | 41 ---------------- > package/sunxi-mali-mainline/Config.in | 42 ---------------- > .../sunxi-mali-mainline.mk | 49 ------------------- > .../Config.in | 20 ++++---- > .../sunxi-mali-utgard-driver.hash} | 2 +- > .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ > package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ > .../egl.pc | 0 > .../glesv2.pc | 0 > .../sunxi-mali-utgard.hash} | 2 +- > .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ > 21 files changed, 206 insertions(+), 159 deletions(-) > create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment > delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk > delete mode 100644 package/sunxi-mali-mainline/Config.in > delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk > rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) > rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) > create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk > create mode 100644 package/sunxi-mali-utgard/Config.in > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) > rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) > create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading 2022-01-06 18:03 ` Arnout Vandecappelle @ 2022-01-06 22:24 ` Luca Ceresoli 0 siblings, 0 replies; 29+ messages in thread From: Luca Ceresoli @ 2022-01-06 22:24 UTC (permalink / raw) To: Arnout Vandecappelle, Giulio Benetti, buildroot Cc: Thomas De Schampheleire, Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni Hi Arnout, On 06/01/22 19:03, Arnout Vandecappelle wrote: > > > On 05/11/2021 23:17, Giulio Benetti wrote: >> With this patchset I respin the first 2 patches. While testing on >> hardware >> the patches they work, but I've left back an error while bumping linux >> version to 5.14. The error is that Linux's sunxi_defconfig(used by both >> a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want >> to use Mali driver, so when Mali driver tries to load(being it a module), >> it finds that Lima already has taken gpu resources and fail. So here I >> add >> 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 >> to use that fragment in a20_olinuxino_lime/2. >> >> Giulio Benetti (3): >> board/olimex/a20_olinuxino: add linux-disable-lima.fragment >> configs/olimex_a20_olinuxino_lime2_defconfig: use >> linux-disable-lima.fragment >> configs/olimex_a20_olinuxino_lime_defconfig: use >> linux-disable-lima.fragment >> >> Miquel Raynal (2): >> package/sunxi-mali-utgard: rename from sunxi-mali-mainline >> package/sunxi-mali-utgard-driver: rename from >> sunxi-mali-mainline-driver > > I applied these two patches to master. > > Luca, your review was very much appreciated so if you could maybe > review the rest of this series as well? :-) I'm afraid I'm unable to do so these days. Hopefully next week. -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver 2021-11-04 6:38 [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2021-11-04 6:38 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti @ 2021-11-04 6:38 ` Giulio Benetti 2021-11-04 9:26 ` Luca Ceresoli 2021-11-04 6:40 ` [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2 siblings, 1 reply; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 6:38 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Luca Ceresoli, Giulio Benetti, Thomas De Schampheleire From: Miquel Raynal <miquel.raynal@bootlin.com> This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing this driver. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. Add a legacy entry. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> [Giulio: rebase on master. Add legacy entry instead of substituting the blob's one] --- Config.in.legacy | 12 ++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- package/Config.in | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ------------------- .../Config.in | 16 ++++---- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 +++++++++++++++++++ 9 files changed, 66 insertions(+), 54 deletions(-) delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (67%) rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk diff --git a/Config.in.legacy b/Config.in.legacy index a209537423..1aac28382a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,18 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + help + Since the removal of the sunxi-mali-driver package, the + sunxi-mali-mainline-driver package that coexisted became the + only package to provide the Sunxi Mali driver. The "-mainline" + suffix being undescriptive nowadays and before adding new + packages bringing Mali support for other SoCs/GPU flavors, it + is clearer to rename it SUNXI_MALI_UTGARD_DRIVER. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE bool "sunxi-mali-mainline package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6f3afd639d..46b294852a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-utgard/ +F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index d0ebeb53a3..f84a7ec7d1 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 000071b11c..5cb36f46a3 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/package/Config.in b/package/Config.in index 1006161497..9201376dcf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline-driver/Config.in" source "package/sunxi-mali-utgard/Config.in" + source "package/sunxi-mali-utgard-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk deleted file mode 100644 index 6782ca7fc2..0000000000 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline-driver -# -################################################################################ - -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) -SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux -SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 -SUNXI_MALI_MAINLINE_DRIVER_LICENSE_FILES = LICENSE - -SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ - $(LINUX_MAKE_FLAGS) \ - KDIR=$(LINUX_DIR) - -define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh -endef - -SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - -define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b -endef - -define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i -endef - -define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) -endef - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in similarity index 67% rename from package/sunxi-mali-mainline-driver/Config.in rename to package/sunxi-mali-utgard-driver/Config.in index 236470db53..244283f44d 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -1,22 +1,22 @@ -comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" +comment "sunxi-mali-utgard-driver needs a Linux kernel to be built" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - bool "sunxi-mali-mainline-driver" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + bool "sunxi-mali-utgard-driver" default y depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help This package builds and installs the Linux kernel driver for - the Mali GPU on Allwinner platforms, compatible with recent - Linux kernels (>= 4.4). Note that it should be installed - together with the corresponding userspace OpenGL libraries, - which are provided as binaries only at: + the Mali Utgard GPU on Allwinner platforms, compatible with + recent Linux kernels (>= 4.4). Note that it should be + installed together with the corresponding userspace OpenGL + libraries, which are provided as binaries only at: https://github.com/bootlin/mali-blobs - sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + sunxi-mali-utgard-driver requires a Linux kernel >= 4.4 with the following options enabled: - CONFIG_CMA diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash similarity index 66% rename from package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash rename to package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index f08e80f114..4b276fecb7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk new file mode 100644 index 0000000000..5f9090f492 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# sunxi-mali-utgard-driver +# +################################################################################ + +SUNXI_MALI_UTGARD_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux +SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 +SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE + +SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ + $(LINUX_MAKE_FLAGS) \ + KDIR=$(LINUX_DIR) + +define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + +define SUNXI_MALI_UTGARD_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b +endef + +define SUNXI_MALI_UTGARD_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i +endef + +define SUNXI_MALI_UTGARD_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + +$(eval $(generic-package)) -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver 2021-11-04 6:38 ` [Buildroot] [PATCH 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti @ 2021-11-04 9:26 ` Luca Ceresoli 0 siblings, 0 replies; 29+ messages in thread From: Luca Ceresoli @ 2021-11-04 9:26 UTC (permalink / raw) To: Giulio Benetti, buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Miquel Raynal, Thomas De Schampheleire Hi Giulio, On 04/11/21 07:38, Giulio Benetti wrote: > From: Miquel Raynal <miquel.raynal@bootlin.com> > > This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The > trailing -mainline is historical and was used at a time when there was > two packages providing this driver. The "non-upstream" package has > been removed some time ago so before adding new packages bringing > support for other ARM Mali GPU versions or implementations, rename > sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. > > Add a legacy entry. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > [Giulio: rebase on master. Add legacy entry instead of substituting the > blob's one] Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> -- Luca _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* 2021-11-04 6:38 [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2021-11-04 6:38 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-04 6:38 ` [Buildroot] [PATCH 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti @ 2021-11-04 6:40 ` Giulio Benetti 2 siblings, 0 replies; 29+ messages in thread From: Giulio Benetti @ 2021-11-04 6:40 UTC (permalink / raw) To: buildroot Cc: Julien Olivain, Peter Seiderer, Julien Corjon, Thomas Petazzoni, Luca Ceresoli, Thomas De Schampheleire Hello, On 11/4/21 7:38 AM, Giulio Benetti wrote: > With this patchset I re-spin a part of a pending patchset[1] to rename > sunxi-mali-mainline* packages to sunxi-mali-utgard*. This clarifies which > kind of Allwinner(sunxi) Mali driver/blob we're dealing with and for the > future it makes more clear adding Rockchip Mali present in the same [1] > patchset I will take care of. > > [1]: https://patchwork.ozlabs.org/project/buildroot/list/?series=162754 For patchset[1] I ask to tag as "superseded" patches [1/7] and [2/7]. Thank you Best regards -- Giulio Benetti Benetti Engineering sas > Miquel Raynal (2): > package/sunxi-mali-utgard: rename from sunxi-mali-mainline > package/sunxi-mali-utgard-driver: rename from > sunxi-mali-mainline-driver > > Config.in.legacy | 42 ++++++++++++++++ > DEVELOPERS | 4 +- > configs/olimex_a20_olinuxino_lime2_defconfig | 4 +- > configs/olimex_a20_olinuxino_lime_defconfig | 4 +- > docs/manual/adding-packages-virtual.txt | 2 +- > package/Config.in | 4 +- > package/glslsandbox-player/Config.in | 4 +- > .../glslsandbox-player/glslsandbox-player.mk | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > .../sunxi-mali-mainline-driver.mk | 41 ---------------- > package/sunxi-mali-mainline/Config.in | 42 ---------------- > .../sunxi-mali-mainline.mk | 49 ------------------- > .../Config.in | 20 ++++---- > .../sunxi-mali-utgard-driver.hash} | 2 +- > .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ > package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ > .../egl.pc | 0 > .../glesv2.pc | 0 > .../sunxi-mali-utgard.hash} | 2 +- > .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ > 20 files changed, 200 insertions(+), 157 deletions(-) > delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk > delete mode 100644 package/sunxi-mali-mainline/Config.in > delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk > rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) > rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) > create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk > create mode 100644 package/sunxi-mali-utgard/Config.in > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) > rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) > create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2022-01-08 14:12 UTC | newest] Thread overview: 29+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-11-04 6:38 [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2021-11-04 6:38 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-04 9:26 ` Luca Ceresoli 2021-11-04 17:23 ` [Buildroot] [PATCH v2 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti 2021-11-04 17:23 ` [Buildroot] [PATCH v2 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-05 11:04 ` Luca Ceresoli 2021-11-04 17:23 ` [Buildroot] [PATCH v2 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti 2021-11-05 11:04 ` Luca Ceresoli 2021-11-04 17:23 ` [Buildroot] [PATCH 1/2] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-05 11:04 ` Luca Ceresoli 2021-11-05 13:24 ` Giulio Benetti 2021-11-05 15:46 ` Luca Ceresoli 2021-11-05 17:08 ` Giulio Benetti 2021-11-05 18:59 ` Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 1/5] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 2/5] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti 2021-11-05 22:17 ` [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment Giulio Benetti 2022-01-08 14:10 ` Thomas Petazzoni 2021-11-05 22:17 ` [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment Giulio Benetti 2022-01-08 14:10 ` Thomas Petazzoni 2021-11-05 22:18 ` [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: " Giulio Benetti 2022-01-08 14:10 ` Thomas Petazzoni 2021-11-05 22:20 ` [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading Giulio Benetti 2022-01-06 18:03 ` Arnout Vandecappelle 2022-01-06 22:24 ` Luca Ceresoli 2021-11-04 6:38 ` [Buildroot] [PATCH 2/2] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Giulio Benetti 2021-11-04 9:26 ` Luca Ceresoli 2021-11-04 6:40 ` [Buildroot] [PATCH 0/2] Rename sunxi-mali-mainline* to sunxi-mali-utgard* Giulio Benetti
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox