From 45b4a7eaf90f00b1dbcf21c13dd71bae64ff5968 Mon Sep 17 00:00:00 2001 From: kszaq Date: Thu, 16 May 2019 21:29:53 +0200 Subject: [PATCH] gpu-sunxi-midgard: rename to mali-midgard --- .../package.mk | 18 ++++++++++++------ .../patches/01-add-bus-clk-and-reset.patch | 0 .../patches/02-restore-old-api.patch | 0 ...u-arm-Midgard-setup_timer-timer_setup.patch | 0 ...-Midgard-Replace-ACCESS_ONCE-by-READ_.patch | 0 ...m-midgard-Remove-sys_close-references.patch | 0 .../patches/06-fix-4.20-build.patch | 0 .../patches/07-some-fixes.patch | 0 .../patches/08-fix-building-with-5.0.patch | 0 .../patches/09-fix-building-with-5.1.patch | 0 projects/Allwinner/devices/H6/options | 2 +- 11 files changed, 13 insertions(+), 7 deletions(-) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/package.mk (68%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/01-add-bus-clk-and-reset.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/02-restore-old-api.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/03-gpu-arm-Midgard-setup_timer-timer_setup.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/04-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/05-gpu-arm-midgard-Remove-sys_close-references.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/06-fix-4.20-build.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/07-some-fixes.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/08-fix-building-with-5.0.patch (100%) rename packages/linux-drivers/{gpu-sunxi-midgard => mali-midgard}/patches/09-fix-building-with-5.1.patch (100%) diff --git a/packages/linux-drivers/gpu-sunxi-midgard/package.mk b/packages/linux-drivers/mali-midgard/package.mk similarity index 68% rename from packages/linux-drivers/gpu-sunxi-midgard/package.mk rename to packages/linux-drivers/mali-midgard/package.mk index 1c6769acdf..bb08ed8518 100644 --- a/packages/linux-drivers/gpu-sunxi-midgard/package.mk +++ b/packages/linux-drivers/mali-midgard/package.mk @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) -PKG_NAME="gpu-sunxi-midgard" +PKG_NAME="mali-midgard" PKG_VERSION="r22p0-01rel0" PKG_SHA256="02f80e777dc945d645fce888afc926555ec61b70079c1da289bf1a3a9544452f" PKG_ARCH="arm aarch64" @@ -10,18 +10,24 @@ PKG_SITE="https://developer.arm.com/products/software/mali-drivers/" PKG_URL="https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-midgard-gpu/TX011-SW-99002-$PKG_VERSION.tgz" PKG_DEPENDS_TARGET="toolchain linux" PKG_NEED_UNPACK="$LINUX_DEPENDS" -PKG_LONGDESC="gpu-sunxi-midgard: Linux drivers for Mali GPUs found in Allwinner SoCs" +PKG_LONGDESC="mali-midgard: Linux drivers for Mali Midgard GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" +case $PROJECT in + Allwinner) + PKG_EXTRA_CFLAGS="-DCONFIG_MALI_PLATFORM_DEVICETREE -DCONFIG_MALI_DEVFREQ" + ;; +esac + make_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard/ \ - EXTRA_CFLAGS="-DCONFIG_MALI_PLATFORM_DEVICETREE -DCONFIG_MALI_BACKEND=gpu -DCONFIG_MALI_DEVFREQ" CONFIG_MALI_DEVFREQ=y \ - CONFIG_MALI_MIDGARD=m CONFIG_MALI_PLATFORM_DEVICETREE=y CONFIG_MALI_BACKEND=gpu modules + kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard \ + EXTRA_CFLAGS="${PKG_EXTRA_CFLAGS} -DCONFIG_MALI_BACKEND=gpu" \ + CONFIG_MALI_MIDGARD=m } makeinstall_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard/ \ + kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard \ INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \ modules_install } diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/01-add-bus-clk-and-reset.patch b/packages/linux-drivers/mali-midgard/patches/01-add-bus-clk-and-reset.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/01-add-bus-clk-and-reset.patch rename to packages/linux-drivers/mali-midgard/patches/01-add-bus-clk-and-reset.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/02-restore-old-api.patch b/packages/linux-drivers/mali-midgard/patches/02-restore-old-api.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/02-restore-old-api.patch rename to packages/linux-drivers/mali-midgard/patches/02-restore-old-api.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/03-gpu-arm-Midgard-setup_timer-timer_setup.patch b/packages/linux-drivers/mali-midgard/patches/03-gpu-arm-Midgard-setup_timer-timer_setup.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/03-gpu-arm-Midgard-setup_timer-timer_setup.patch rename to packages/linux-drivers/mali-midgard/patches/03-gpu-arm-Midgard-setup_timer-timer_setup.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/04-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch b/packages/linux-drivers/mali-midgard/patches/04-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/04-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch rename to packages/linux-drivers/mali-midgard/patches/04-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/05-gpu-arm-midgard-Remove-sys_close-references.patch b/packages/linux-drivers/mali-midgard/patches/05-gpu-arm-midgard-Remove-sys_close-references.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/05-gpu-arm-midgard-Remove-sys_close-references.patch rename to packages/linux-drivers/mali-midgard/patches/05-gpu-arm-midgard-Remove-sys_close-references.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/06-fix-4.20-build.patch b/packages/linux-drivers/mali-midgard/patches/06-fix-4.20-build.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/06-fix-4.20-build.patch rename to packages/linux-drivers/mali-midgard/patches/06-fix-4.20-build.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/07-some-fixes.patch b/packages/linux-drivers/mali-midgard/patches/07-some-fixes.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/07-some-fixes.patch rename to packages/linux-drivers/mali-midgard/patches/07-some-fixes.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/08-fix-building-with-5.0.patch b/packages/linux-drivers/mali-midgard/patches/08-fix-building-with-5.0.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/08-fix-building-with-5.0.patch rename to packages/linux-drivers/mali-midgard/patches/08-fix-building-with-5.0.patch diff --git a/packages/linux-drivers/gpu-sunxi-midgard/patches/09-fix-building-with-5.1.patch b/packages/linux-drivers/mali-midgard/patches/09-fix-building-with-5.1.patch similarity index 100% rename from packages/linux-drivers/gpu-sunxi-midgard/patches/09-fix-building-with-5.1.patch rename to packages/linux-drivers/mali-midgard/patches/09-fix-building-with-5.1.patch diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options index 7d66ff14b1..b7440d96e4 100644 --- a/projects/Allwinner/devices/H6/options +++ b/projects/Allwinner/devices/H6/options @@ -29,7 +29,7 @@ ATF_PLATFORM="sun50i_h6" # additional drivers to install: - ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS gpu-sunxi-midgard" + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS mali-midgard" # Mali GPU family MALI_FAMILY="t720"