summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaoliang Wang <xiaoliang.wang@amlogic.com>2019-04-26 23:10:21 +0800
committerXiaoliang Wang <xiaoliang.wang@amlogic.com>2019-04-26 23:10:21 +0800
commit910f7d62f538545c57a8717e77a3b6a13697bf0e (patch)
tree6360e4427c2f036ed276eca7974d22b575ac1fb2
parentaeb87aeaaf530789009b1e719449351a6433e182 (diff)
downloadmali-driver-android-tv-4.9-pie.tar.gz
Revert "gpu:path for mali.ko is not correct for prebuild kernel[1/1]"android-tv-9.0.0_r0.1android-tv-4.9-pie
This reverts commit aeb87aeaaf530789009b1e719449351a6433e182. Reason for revert: <INSERT REASONING HERE> Change-Id: I0d1c2c0409fdc39aa49e8cf4374ccec43ddc15ce
-rw-r--r--[-rwxr-xr-x]gpu-v2.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/gpu-v2.mk b/gpu-v2.mk
index 2fdce69..028d6ab 100755..100644
--- a/gpu-v2.mk
+++ b/gpu-v2.mk
@@ -19,9 +19,12 @@ GPU_MODS_OUT?=system/lib
KERNEL_ARCH ?= arm
GPU_DRV_VERSION?=r6p1
-$(PRODUCT_OUT)/obj/lib_vendor/mali.ko: $(GPU_ARCH).ko
- cp $(PRODUCT_OUT)/$(GPU_MODS_OUT)/mali.ko $(PRODUCT_OUT)/obj/lib_vendor/mali.ko
- echo "$(GPU_ARCH).ko build finished"
+$(INSTALLED_KERNEL_TARGET):mali.ko
+$(PRODUCT_OUT)/ramdisk.img:mali.ko
+$(PRODUCT_OUT)/system.img:mali.ko
+
+mali.ko: $(GPU_ARCH).ko
+ cp $(PRODUCT_OUT)/$(GPU_MODS_OUT)/$(GPU_ARCH).ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/mali.ko
#TODO rm shell cmd
# utgard-modules $(MESON_GPU_DIR) $(GPU_DRV_VERSION) $(KERNEL_ARCH)
@@ -41,7 +44,7 @@ define utgard-modules
@echo "GPU_MODS_OUT is $(GPU_MODS_OUT)"
mkdir -p $(PRODUCT_OUT)/$(GPU_MODS_OUT)
- cp $(PRODUCT_OUT)/obj/mali/mali.ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/mali.ko
+ cp $(PRODUCT_OUT)/obj/mali/mali.ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/utgard.ko
endef
#$(call midgard-modules,$(MESON_GPU_DIR),$(MESON_GPU_DIR)/midgard/$(GPU_DRV_VERSION),$(KERNEL_ARCH))
@@ -58,7 +61,7 @@ define midgard-modules
mkdir -p $(PRODUCT_OUT)/$(GPU_MODS_OUT)
@echo "GPU_MODS_OUT is $(GPU_MODS_OUT)"
- cp $(PRODUCT_OUT)/obj/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase.ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/mali.ko
+ cp $(PRODUCT_OUT)/obj/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase.ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/midgard.ko
@echo "make mali module finished current dir is $(shell pwd)"
endef
@@ -76,7 +79,7 @@ define bifrost-modules
mkdir -p $(PRODUCT_OUT)/$(GPU_MODS_OUT)
@echo "GPU_MODS_OUT is $(GPU_MODS_OUT)"
- cp $(PRODUCT_OUT)/obj/bifrost/kernel/drivers/gpu/arm/midgard/mali_kbase.ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/mali.ko
+ cp $(PRODUCT_OUT)/obj/bifrost/kernel/drivers/gpu/arm/midgard/mali_kbase.ko $(PRODUCT_OUT)/$(GPU_MODS_OUT)/bifrost.ko
@echo "make mali module finished current dir is $(shell pwd)"
endef