remove mali binaries

depend on external package for libmali firmware
use global configs from radxa bsp
change version to maj.min.revcount.hash
make 4.4 silence patch

5 files changed, 25 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a462d681b252..ce7e6a79701d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-radxa-rkbsp5-git
 	pkgdesc = Latest git Linux kernel package based on 5.10.x BSP kernel published by RADXA targetting rk3399 based rock4 and rk3588 based rock5 boards
-	pkgver = 5.10.1080722.fd78925da2ce.fadb8d5
-	pkgrel = 3
+	pkgver = 5.10.1080666.fd78925da2ce
+	pkgrel = 1
 	url = https://github.com/radxa
 	arch = aarch64
 	license = GPL2
@@ -17,6 +17,7 @@ pkgbase = linux-radxa-rkbsp5-git
 	options = !strip
 	source = git+https://github.com/radxa/kernel.git#branch=linux-5.10-gen-rkr4.1
 	source = git+https://github.com/radxa/overlays.git#branch=main
+	source = git+https://github.com/radxa-repo/bsp.git#branch=main
 	source = linux.preset
 	source = extlinux.arch.template
 	source = 0001-VENDOR-Add-Radxa-overlays.patch
@@ -34,11 +35,8 @@ pkgbase = linux-radxa-rkbsp5-git
 	source = 0020-dma-buf-add-dma_resv_get_singleton-v2.patch
 	source = 0021-dma-buf-Add-an-API-for-exporting-sync-files-v14.patch
 	source = 0022-dma-buf-Add-an-API-for-importing-sync-files-v10.patch
-	source = libmali_g610_wayland.so::https://github.com/JeffyCN/mirrors/raw/9869c5a8aa0c103efac5a5d5eefe03468a6b8396/lib/aarch64-linux-gnu/libmali-valhall-g610-g13p0-wayland-gbm.so
-	source = libmali_g610_x.so::https://github.com/JeffyCN/mirrors/raw/9869c5a8aa0c103efac5a5d5eefe03468a6b8396/lib/aarch64-linux-gnu/libmali-valhall-g610-g13p0-x11-gbm.so
-	source = mali_csffw.bin::https://github.com/JeffyCN/mirrors/raw/488f49467f5b4adb8ae944221698e9a4f9acb0ed/firmware/g610/mali_csffw.bin
-	source = libmali
-	source = libmaliw
+	source = 0023-make-4-4-silence.patch
+	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = bd296f775df973c6dcb6bd8311ce4d3af9a8d4a67905f17c450cae776aab0229987d473334d38fd102a34ed483a121f67ac58a48fd9e6fab2c714c7079e06613
@@ -58,11 +56,7 @@ pkgbase = linux-radxa-rkbsp5-git
 	b2sums = c3487e98544c2d36e60f3c3f2fabff94b3d4b157f2858c67c526dd8fdac8685dae3c2c7c07d4398b898943257f16ddc469dc633619862fe5b8da76fd317bca42
 	b2sums = b9eb4d0856adc68350dba4d7a8076cddddf97061244cd9aea422c549f2dd2f1f951087835ee957ce0117bf468f0d3068d7f52ce5f486ce00263101af4ab2ba68
 	b2sums = eccbf9cf7efd9f5e4f0d12fc59b7f86e1a212ef35e99250f9bc836efe675b1abd81c8997994c8986aa5ec1886e6908abd13473e57523846a15a355fa13beeec7
-	b2sums = 7ef307add1d4f2d17ece5a057b106616b5e32378c529783b6dcf68621d34ff02285bc94cf6b76729dde2626a38f0afb57e0100c83ce269b854fd3216c548a051
-	b2sums = 7262a58ba3342e8889290330b771be7f1f995170003e6c2f14048ec0020f0aa2ed8e12d1e8a7058476e1e33ae03ba36dcbad8d097f7711603e06a69fe883d7e7
-	b2sums = 8df273b81667f27c8490ae05ed38a22084171710f0178ae07d29e842389da4dc013612510a84694aa6ded908acea3892c7e486459ee32291e3872f1272c75210
-	b2sums = 75606e8ac064597091850b4d8192ab248bf15127756ca454f07d33390903ab0306d7727345dd9cf37015666ee4c4c915f2c996647fa833c420a72e4a5dff97a6
-	b2sums = 4915c805a1ad4f98c4975c4dfa358f16a0fbf1e8096f11189ff019e6d9fa4bb6b5b6e70b8fd5b527fd65a14cb6eb9734afcc05a079b9980ff5d5195d757ac5b4
+	b2sums = 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce
 
 pkgname = linux-radxa-rkbsp5-git-headers
 
diff --git a/0023-make-4-4-silence.patch b/0023-make-4-4-silence.patch
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/0023-make-4-4-silence.patch
diff --git a/PKGBUILD b/PKGBUILD
index 6276d4086305..4db8116bdbec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,19 @@ _user="radxa"
 _kernel=linux-radxa-rkbsp5
 pkgbase=$_kernel-git
 pkgname=("${pkgbase}-headers" $pkgbase)
-pkgver=5.10.1080722.fd78925da2ce.fadb8d5
+pkgver=5.10.1080666.fd78925da2ce
 blobcommit="9869c5a8aa0c103efac5a5d5eefe03468a6b8396"
 fwcommit="488f49467f5b4adb8ae944221698e9a4f9acb0ed"
-pkgrel=3
+pkgrel=1
 arch=('aarch64')
 license=('GPL2')
 url="https://github.com/${_user}"
 _kernelrepo="kernel"
 _overlayrepo="overlays"
+_bsprepo="bsp"
 _kernelbranch=linux-5.10-gen-rkr4.1
 _overlaybranch=main
+_bspbranch="main"
 pkgdesc="Latest git Linux kernel package based on 5.10.x BSP kernel published by RADXA targetting rk3399 based rock4 and rk3588 based rock5 boards" 
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
 options=('!strip')
@@ -28,6 +30,7 @@ options=('!strip')
 # Patch12: Force Enabling AV1 decoder in 3588. This may be implemented in radxa git as well soon
 source=(git+https://github.com/$_user/$_kernelrepo.git#branch=$_kernelbranch
         git+https://github.com/$_user/$_overlayrepo.git#branch=$_overlaybranch
+        git+https://github.com/$_user-repo/$_bsprepo.git#branch=$_bspbranch
 		'linux.preset'
 		'extlinux.arch.template'
 		'0001-VENDOR-Add-Radxa-overlays.patch'
@@ -45,15 +48,12 @@ source=(git+https://github.com/$_user/$_kernelrepo.git#branch=$_kernelbranch
 		'0020-dma-buf-add-dma_resv_get_singleton-v2.patch'
 		'0021-dma-buf-Add-an-API-for-exporting-sync-files-v14.patch'
 		'0022-dma-buf-Add-an-API-for-importing-sync-files-v10.patch'
-		"libmali_g610_wayland.so::https://github.com/JeffyCN/mirrors/raw/${blobcommit}/lib/aarch64-linux-gnu/libmali-valhall-g610-g13p0-wayland-gbm.so"
-        "libmali_g610_x.so::https://github.com/JeffyCN/mirrors/raw/${blobcommit}/lib/aarch64-linux-gnu/libmali-valhall-g610-g13p0-x11-gbm.so"
-        "mali_csffw.bin::https://github.com/JeffyCN/mirrors/raw/${fwcommit}/firmware/g610/mali_csffw.bin"
-        "libmali"
-        "libmaliw"
+		'0023-make-4-4-silence.patch'
 		)
 
 b2sums=('SKIP'
         'SKIP'
+        'SKIP'
         'bd296f775df973c6dcb6bd8311ce4d3af9a8d4a67905f17c450cae776aab0229987d473334d38fd102a34ed483a121f67ac58a48fd9e6fab2c714c7079e06613'
         'd8208257c8f2e23a9dbcf2a1bbd11b5a638679cd49dd03d4ea190d1ecd94e2760cccb2cd1cda890816a9c338ce2f38c859961f4ab3a22fca458a453ca0d5f2fc'
         '4908b5a94c02a4eb0fe8bb9983289f1b8acbb1b8ebb541643c7ec4ac5de87be949efbdec839d34603b045500b13033f836385bdbf3e935fcd8d221f71028d604'
@@ -71,23 +71,20 @@ b2sums=('SKIP'
         'c3487e98544c2d36e60f3c3f2fabff94b3d4b157f2858c67c526dd8fdac8685dae3c2c7c07d4398b898943257f16ddc469dc633619862fe5b8da76fd317bca42'
         'b9eb4d0856adc68350dba4d7a8076cddddf97061244cd9aea422c549f2dd2f1f951087835ee957ce0117bf468f0d3068d7f52ce5f486ce00263101af4ab2ba68'
         'eccbf9cf7efd9f5e4f0d12fc59b7f86e1a212ef35e99250f9bc836efe675b1abd81c8997994c8986aa5ec1886e6908abd13473e57523846a15a355fa13beeec7'
-        '7ef307add1d4f2d17ece5a057b106616b5e32378c529783b6dcf68621d34ff02285bc94cf6b76729dde2626a38f0afb57e0100c83ce269b854fd3216c548a051'
-        '7262a58ba3342e8889290330b771be7f1f995170003e6c2f14048ec0020f0aa2ed8e12d1e8a7058476e1e33ae03ba36dcbad8d097f7711603e06a69fe883d7e7'
-        '8df273b81667f27c8490ae05ed38a22084171710f0178ae07d29e842389da4dc013612510a84694aa6ded908acea3892c7e486459ee32291e3872f1272c75210'
-        '75606e8ac064597091850b4d8192ab248bf15127756ca454f07d33390903ab0306d7727345dd9cf37015666ee4c4c915f2c996647fa833c420a72e4a5dff97a6'
-        '4915c805a1ad4f98c4975c4dfa358f16a0fbf1e8096f11189ff019e6d9fa4bb6b5b6e70b8fd5b527fd65a14cb6eb9734afcc05a079b9980ff5d5195d757ac5b4')
+        '786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce')
 
 pkgver(){
 	#gets the commit count of both repos + _pkgrel and sums them to calculate the revision number
 	cd overlays
-	local _ocommits="$(git rev-list --count HEAD)"
-	local _ocommit="$(git rev-parse --short HEAD)"
+	local _ocommits="$(git rev-list --count HEAD arch/arm64/boot/dts/rockchip)"
+	cd ../bsp
+	local _bcommits="$(git rev-list --count HEAD linux/.common/kconfig.conf)"
 	cd ../kernel
 	local _kcommits="$(git rev-list --count HEAD)"
 	local _kcommit="$(git rev-parse --short HEAD)"
-	
-	local _revnum=$(($_kcommits + $_ocommits + $pkgrel))
-	local _version="${_pkgver}.${_revnum}.${_kcommit}.${_ocommit}"
+
+	local _revnum=$(($_kcommits + $_ocommits + $_bcommits + $_fcommits + $pkgrel))
+	local _version="${_pkgver}.${_revnum}.${_kcommit}"
 	echo $_version > pkgver
 	printf $_version
 }
@@ -112,13 +109,13 @@ prepare() {
     cp -f ../../custom/config ./.config
   else 
     cp -f arch/arm64/configs/rockchip_linux_defconfig ./.config
+    scripts/kconfig/merge_config.sh -m .config ../bsp/linux/rockchip/kconfig.conf
+    scripts/kconfig/merge_config.sh -m .config ../bsp/linux/.common/kconfig.conf
   fi
 
   # fix distcc build which does not support gcc plugins
   sed -i 's/CONFIG_GCC_PLUGINS=y/CONFIG_GCC_PLUGINS=n/g' .config
   
-  # enable faster DMA transfer provided through patches 21-25
-  echo "\nCONFIG_SYNC_FILE=y" >> .config
 }
 
 build() {
@@ -129,7 +126,7 @@ build() {
   _version="${_version//\./-}"
   sed  -i "5s/.*/EXTRAVERSION = ${_version}/" Makefile
   echo "-radxa-rkbsp" > .scmversion
-  # should result in kernelmaj.kernelmin.patchver-totalcommitnum-hashofkernel-hashofoverlays-radxa-rkbsp
+  # should result in kernelmaj.kernelmin.patchver-totalcommitnum-hashofkernel-radxa-rkbsp
  
   make olddefconfig prepare
   make -s kernelrelease > version
@@ -140,10 +137,10 @@ build() {
 
 _package-git() {
   pkgdesc="Latest Git Linux kernel based on 5.10.x BSP published by RADXA targetting rk3399 based rock4 and rk3588 based rock5 boards"
-  depends=('coreutils' 'kmod' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'kmod' 'mkinitcpio>=0.7' 'mali-valhall-g610-firmware')
   optdepends=('wireless-regdb: to set the correct wireless channels of your country')
   provides=("linux=${pkgver}" "linux-rkbsp")
-  conflicts=('linux' 'libmali')
+  conflicts=('linux')
   backup=("etc/mkinitcpio.d/${_kernel}.preset")
 
   cd kernel
@@ -177,23 +174,6 @@ _package-git() {
   # install mkinitcpio preset file
   sed "$_subst" ../linux.preset |
     install -Dm644 /dev/stdin "$pkgdir/etc/mkinitcpio.d/$_kernel.preset"
-  
-  cd ../
-  # install the firmware
-  install -Dm755 mali_csffw.bin $pkgdir/usr/lib/firmware/mali_csffw.bin
-
-  # install blob drivers
-  for d in x wayland; do
-    install -Dm755 libmali_g610_$d.so $pkgdir/usr/lib/libmali/libmali_g610_$d.so
-    install -dm755 $pkgdir/usr/lib/libmali/$d
-    for l in libEGL.so libEGL.so.1 libgbm.so.1 libGLESv2.so libGLESv2.so.2 libGLESv2_CM.so libOpenCL.so.1; do
-      ln -s ../libmali_g610_$d.so $pkgdir/usr/lib/libmali/$d/$l;
-    done
-  done
-
-  # install the helper scripts
-  install -Dm755 libmali $pkgdir/usr/bin/libmali
-  install -Dm755 libmaliw $pkgdir/usr/bin/libmaliw
 }
 
 _package-git-headers() {
diff --git a/libmali b/libmali
deleted file mode 100755
index 42c536bb19a0..000000000000
--- a/libmali
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-APP=$(which $1)
-ARGS=${@:2}
-HASRPATH=$(chrpath -l $APP | grep -o /usr/lib)
-export LIBGL_DEEPBIND=0
-export LD_LIBRARY_PATH="/usr/lib/gl4es:/usr/lib/libmali/x:$LD_LIBRARY_PATH"
-export LD_PRELOAD="/usr/lib/libdri2to3.so:$LD_PRELOAD"
-# linux linker loads the shared libs in the order of 1. RPATH of the elf, then LD_LIBRARY_PATH
-# if a binary has RPATH pointed out to /usr/lib, then this causes system GL libraries to load
-# in such a case we load the app directly with linker ommitting the rpath of /usr/lib
-echo $HASRPATH
-if [ -z $HASRPATH ]
-then
-    echo "Running ${APP} on X with libmali"
-    exec $APP $ARGS
-else
-    echo "Running ${APP} on X with libmali using linker"
-    exec /lib/ld-linux-aarch64.so.1 --inhibit-rpath :/usr/lib $APP $ARGS
-fi
diff --git a/libmaliw b/libmaliw
deleted file mode 100755
index 03f667ad50b6..000000000000
--- a/libmaliw
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-APP=$(which $1)
-ARGS=${@:2}
-HASRPATH=$(chrpath -l $APP | grep -o /usr/lib)
-export LIBGL_DEEPBIND=0
-export LD_LIBRARY_PATH="/usr/lib/gl4es:/usr/lib/libmali/wayland:$LD_LIBRARY_PATH"
-# linux linker loads the shared libs in the order of 1. RPATH of the elf, then LD_LIBRARY_PATH
-# if a binary has RPATH pointed out to /usr/lib, then this causes system GL libraries to load
-# in such a case we load the app directly with linker ommitting the rpath of /usr/lib
-echo $HASRPATH
-if [ -z $HASRPATH ]
-then
-    echo "Running ${APP} on Wayland with libmali"
-    exec $APP $ARGS
-else
-    echo "Running ${APP} on Wayland with libmali using linker"
-    exec /lib/ld-linux-aarch64.so.1 --inhibit-rpath :/usr/lib $APP $ARGS
-fi