diff --git a/packages/linux-drivers/gpu-sunxi/package.mk b/packages/linux-drivers/mali-utgard/package.mk similarity index 74% rename from packages/linux-drivers/gpu-sunxi/package.mk rename to packages/linux-drivers/mali-utgard/package.mk index aac4417ae3..74332e420f 100644 --- a/packages/linux-drivers/gpu-sunxi/package.mk +++ b/packages/linux-drivers/mali-utgard/package.mk @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) -PKG_NAME="gpu-sunxi" +PKG_NAME="mali-utgard" PKG_VERSION="r9p0-01rel0" PKG_SHA256="7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b" PKG_ARCH="arm aarch64" @@ -10,14 +10,20 @@ PKG_SITE="https://developer.arm.com/products/software/mali-drivers/utgard-kernel PKG_URL="https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-$PKG_VERSION.tgz" PKG_DEPENDS_TARGET="toolchain linux" PKG_NEED_UNPACK="$LINUX_DEPENDS" -PKG_LONGDESC="gpu-sunxi: Linux drivers for Mali GPUs found in Allwinner SoCs" +PKG_LONGDESC="mali-utgard: Linux drivers for Mali Utgard GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" +case $PROJECT in + Allwinner) + PKG_MALI_PLATFORM="sunxi" + ;; +esac + make_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/src/devicedrv/mali/ \ - MALI_PLATFORM_FILES=platform/sunxi/sunxi.c \ - EXTRA_CFLAGS="-DMALI_FAKE_PLATFORM_DEVICE=1 -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH" \ + kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/src/devicedrv/mali \ + MALI_PLATFORM_FILES="platform/${PKG_MALI_PLATFORM}/${PKG_MALI_PLATFORM}.c" \ + EXTRA_CFLAGS="-DMALI_FAKE_PLATFORM_DEVICE=1 -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH -DCONFIG_MALI400=1 -DCONFIG_MALI450=1 -DCONFIG_MALI470=1" \ CONFIG_MALI400=m } diff --git a/packages/linux-drivers/gpu-sunxi/patches/add-sunxi-platform.patch b/packages/linux-drivers/mali-utgard/patches/add-sunxi-platform.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi/patches/add-sunxi-platform.patch rename to packages/linux-drivers/mali-utgard/patches/add-sunxi-platform.patch diff --git a/packages/linux-drivers/gpu-sunxi/patches/fix-building-with-4.16.patch b/packages/linux-drivers/mali-utgard/patches/fix-building-with-4.16.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi/patches/fix-building-with-4.16.patch rename to packages/linux-drivers/mali-utgard/patches/fix-building-with-4.16.patch diff --git a/packages/linux-drivers/gpu-sunxi/patches/fix-building-with-4.20.patch b/packages/linux-drivers/mali-utgard/patches/fix-building-with-4.20.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi/patches/fix-building-with-4.20.patch rename to packages/linux-drivers/mali-utgard/patches/fix-building-with-4.20.patch diff --git a/packages/linux-drivers/gpu-sunxi/patches/fix-building-with-5.0.patch b/packages/linux-drivers/mali-utgard/patches/fix-building-with-5.0.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi/patches/fix-building-with-5.0.patch rename to packages/linux-drivers/mali-utgard/patches/fix-building-with-5.0.patch diff --git a/packages/linux-drivers/gpu-sunxi/patches/fix-building-with-5.1.patch b/packages/linux-drivers/mali-utgard/patches/fix-building-with-5.1.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi/patches/fix-building-with-5.1.patch rename to packages/linux-drivers/mali-utgard/patches/fix-building-with-5.1.patch diff --git a/projects/Allwinner/devices/A64/options b/projects/Allwinner/devices/A64/options index f2794bbd5e..724873f446 100644 --- a/projects/Allwinner/devices/A64/options +++ b/projects/Allwinner/devices/A64/options @@ -29,7 +29,7 @@ ATF_PLATFORM="sun50i_a64" # additional drivers to install: - ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS gpu-sunxi" + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS mali-utgard" # Mali GPU family MALI_FAMILY="400" diff --git a/projects/Allwinner/devices/H3/options b/projects/Allwinner/devices/H3/options index dbfe882111..1815848ad1 100644 --- a/projects/Allwinner/devices/H3/options +++ b/projects/Allwinner/devices/H3/options @@ -38,7 +38,7 @@ KERNEL_TARGET="zImage" # additional drivers to install: - ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS gpu-sunxi" + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS mali-utgard" # Mali GPU family MALI_FAMILY="400"