From c5e432f597dc25f252e64d81d98e3474975893b9 Mon Sep 17 00:00:00 2001
From: spycat88 <spycat88@users.noreply.github.com>
Date: Mon, 6 May 2024 21:24:41 +0100
Subject: [PATCH] mali-bifrost: unify Amlogic/Rockchip packages

---
 .../kernel/drivers}/mali-bifrost/package.mk   |  0
 .../drivers}/mali-bifrost/sources/Makefile    |  0
 .../Rockchip/packages/mali-bifrost/package.mk | 26 -------------------
 .../packages/mali-bifrost/sources/Makefile    | 12 ---------
 .../mali-bifrost}/001-single-regulator.patch  |  0
 .../002-lowercase-interrupts-first.patch      |  0
 6 files changed, 38 deletions(-)
 rename {projects/Amlogic/packages => packages/kernel/drivers}/mali-bifrost/package.mk (100%)
 rename {projects/Amlogic/packages => packages/kernel/drivers}/mali-bifrost/sources/Makefile (100%)
 delete mode 100644 projects/Rockchip/packages/mali-bifrost/package.mk
 delete mode 100644 projects/Rockchip/packages/mali-bifrost/sources/Makefile
 rename projects/Rockchip/{packages/mali-bifrost/patches => patches/mali-bifrost}/001-single-regulator.patch (100%)
 rename projects/Rockchip/{packages/mali-bifrost/patches => patches/mali-bifrost}/002-lowercase-interrupts-first.patch (100%)

diff --git a/projects/Amlogic/packages/mali-bifrost/package.mk b/packages/kernel/drivers/mali-bifrost/package.mk
similarity index 100%
rename from projects/Amlogic/packages/mali-bifrost/package.mk
rename to packages/kernel/drivers/mali-bifrost/package.mk
diff --git a/projects/Amlogic/packages/mali-bifrost/sources/Makefile b/packages/kernel/drivers/mali-bifrost/sources/Makefile
similarity index 100%
rename from projects/Amlogic/packages/mali-bifrost/sources/Makefile
rename to packages/kernel/drivers/mali-bifrost/sources/Makefile
diff --git a/projects/Rockchip/packages/mali-bifrost/package.mk b/projects/Rockchip/packages/mali-bifrost/package.mk
deleted file mode 100644
index 78b66a7c71..0000000000
--- a/projects/Rockchip/packages/mali-bifrost/package.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
-
-PKG_NAME="mali-bifrost"
-PKG_VERSION="r48p0-01eac0"
-PKG_LICENSE="GPL"
-PKG_SITE="https://developer.arm.com/downloads/-/mali-drivers/bifrost-kernel"
-PKG_URL="https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-bifrost-gpu/BX304L01B-SW-99002-${PKG_VERSION}.tar"
-PKG_LONGDESC="mali-bifrost: Linux drivers for Mali Bifrost GPUs"
-PKG_ARCH="aarch64"
-PKG_DEPENDS_TARGET="toolchain linux"
-PKG_NEED_UNPACK="${LINUX_DEPENDS}"
-PKG_TOOLCHAIN="manual"
-PKG_IS_KERNEL_PKG="yes"
-
-make_target() {
-  kernel_make KDIR=$(kernel_path) -C ${PKG_BUILD} \
-       CONFIG_MALI_MIDGARD=m CONFIG_MALI_PLATFORM_NAME=meson CONFIG_MALI_REAL_HW=y CONFIG_MALI_DEVFREQ=y CONFIG_MALI_GATOR_SUPPORT=y
-}
-
-makeinstall_target() {
-  DRIVER_DIR=${PKG_BUILD}/product/kernel/drivers/gpu/arm/midgard
-
-  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
-    cp ${DRIVER_DIR}/mali_kbase.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
-}
diff --git a/projects/Rockchip/packages/mali-bifrost/sources/Makefile b/projects/Rockchip/packages/mali-bifrost/sources/Makefile
deleted file mode 100644
index 67d89bbfd0..0000000000
--- a/projects/Rockchip/packages/mali-bifrost/sources/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
-
-export
-
-MALI_KBASE_SRC_DIR = $(CURDIR)/product/kernel/drivers/gpu/arm/midgard
-
-all:
-	$(MAKE) -C $(MALI_KBASE_SRC_DIR) all
-
-clean:
-	$(MAKE) -C $(MALI_KBASE_SRC_DIR) clean
diff --git a/projects/Rockchip/packages/mali-bifrost/patches/001-single-regulator.patch b/projects/Rockchip/patches/mali-bifrost/001-single-regulator.patch
similarity index 100%
rename from projects/Rockchip/packages/mali-bifrost/patches/001-single-regulator.patch
rename to projects/Rockchip/patches/mali-bifrost/001-single-regulator.patch
diff --git a/projects/Rockchip/packages/mali-bifrost/patches/002-lowercase-interrupts-first.patch b/projects/Rockchip/patches/mali-bifrost/002-lowercase-interrupts-first.patch
similarity index 100%
rename from projects/Rockchip/packages/mali-bifrost/patches/002-lowercase-interrupts-first.patch
rename to projects/Rockchip/patches/mali-bifrost/002-lowercase-interrupts-first.patch