Skip to content

libmali - rockchip / amlogic consolidation #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
porschemad911 wants to merge 1 commit into from
Closed

libmali - rockchip / amlogic consolidation #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions projects/ROCKNIX/devices/S922X/options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
UBOOT_FIRMWARE="amlogic-boot-fip"

# Mali GPU family
MALI_FAMILY="bifrost-g52"
MALI_FAMILY="amlogic"
GRAPHIC_DRIVERS="panfrost"

# For maximum cross compatbility
Expand All @@ -69,10 +69,10 @@
# Additional Firmware to use ( )
# Space separated list is supported,
# e.g. FIRMWARE=""
FIRMWARE="libmali-amlogic"
FIRMWARE=""

# Additional packages to install
ADDITIONAL_PACKAGES="weston-kiosk-shell-dpms"
ADDITIONAL_PACKAGES="libmali weston-kiosk-shell-dpms"

# Debug tty path
DEBUG_TTY="/dev/ttyAML0"
Expand Down
8 changes: 4 additions & 4 deletions projects/ROCKNIX/packages/graphics/gpudriver/sources/bin/gpudriver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ load_driver() {
grep -q /usr/lib/libEGL.so /proc/mounts && mount_required=false || mount_required=true

if [[ $mount_required = true ]]; then
mount --bind /usr/lib/mali/libEGL.so.1.4.0 /usr/lib/libEGL.so.1.1.0
mount --bind /usr/lib/mali/libGLESv1_CM.so.1.1.0 /usr/lib/libGLESv1_CM.so.1.2.0
mount --bind /usr/lib/mali/libGLESv2.so.2.1.0 /usr/lib/libGLESv2.so.2.1.0
mount --bind /usr/lib/mali/libgbm.so.1.0.0 /usr/lib/libgbm.so.1.0.0
mount --bind /usr/lib/mali/libEGL.so.1 /usr/lib/libEGL.so.1.1.0
mount --bind /usr/lib/mali/libGLESv1_CM.so.1 /usr/lib/libGLESv1_CM.so.1.2.0
mount --bind /usr/lib/mali/libGLESv2.so.2 /usr/lib/libGLESv2.so.2.1.0
mount --bind /usr/lib/mali/libgbm.so.1 /usr/lib/libgbm.so.1.0.0
fi

# Deliberately break OpenGL checks
Expand Down
17 changes: 12 additions & 5 deletions projects/ROCKNIX/packages/graphics/libmali/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@

PKG_NAME="libmali"
PKG_VERSION="g13p0"
[[ "${DEVICE}" == "S922X" ]] && PKG_VERSION="r51p0-00eac0"
[[ "${DEVICE}" == "S922X" ]] && PKG_ARCH="aarch64"
PKG_LICENSE="nonfree"
PKG_SITE="https://github.com/tsukumijima/libmali-rockchip"
#PKG_SITE="https://github.com/ROCKNIX/libmali"
PKG_SITE="https://github.com/porschemad911/rocknix-libmali"
# zip format makes extract very fast (<1s). tgz takes 20 seconds to scan the whole file
#PKG_URL="${PKG_SITE}/archive/refs/tags/${PKG_VERSION}.zip"
PKG_URL="${PKG_SITE}/archive/master.zip"
#PKG_URL="${PKG_SITE}/archive/master.zip"
PKG_URL="${PKG_SITE}/archive/amlogic.zip"
PKG_DEPENDS_TARGET="toolchain libdrm patchelf:host gpudriver"
PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family"
PKG_TOOLCHAIN="meson"
Expand Down Expand Up @@ -41,9 +45,9 @@ unpack() {
pwd
# Extract only what is needed
LIBNAME="libmali-${MALI_FAMILY}-${PKG_VERSION}-${PLATFORM}.so"
unzip -q "${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME}" "*/hook/*" "*/include/*" "*/scripts/*" "*/meson*" "*/${LIBNAME}"
mv libmali-rockchip-*/* .
rmdir libmali-rockchip-*
unzip -q "${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME}" "*/data/*" "*/hook/*" "*/include/*" "*/scripts/*" "*/meson*" "*/${LIBNAME}"
mv rocknix-libmali*/* .
rmdir rocknix-libmali-*
ln -s lib optimize_3
}

Expand All @@ -61,4 +65,7 @@ post_makeinstall_target() {
if [ ${DEVICE} = "RK3588" ] && [ ${TARGET_ARCH} = "aarch64" ]; then
curl -Lo ${INSTALL}/usr/lib/libmali-${MALI_FAMILY}-${PKG_VERSION}-x11-gbm.so ${PKG_SITE}/raw/master/lib/aarch64-linux-gnu/libmali-${MALI_FAMILY}-${PKG_VERSION}-x11-gbm.so
fi

# S922X - mali vulkan libs need moving
[[ "${DEVICE}" == "S922X" ]] && mv "${INSTALL}"/usr/lib/mali/libMaliVulkan.* "${INSTALL}"/usr/lib/
}