package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver

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>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Miquel Raynal 2021-11-05 23:17:57 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 6a7a652b14
commit c8324bf87c
9 changed files with 66 additions and 54 deletions

View File

@ -146,6 +146,18 @@ endif
comment "Legacy options removed in 2022.02"
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

View File

@ -1082,8 +1082,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/

View File

@ -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

View File

@ -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

View File

@ -571,8 +571,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"

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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))