mv to vendor/amlogic [2/5]

PD#157243

Change-Id: I11d11f89ad58d0e65a10686f7895e4f91393deb4

diff --git a/gpu.mk b/gpu.mk
index 0764a0a42a943402debbfab46c63bac3ba18a2c0..b5e5156abe819c9efde457592497e5d12ab5dc6e 100644 (file)
--- a/gpu.mk
+++ b/gpu.mk
@@ -37,13 +37,14 @@ endif
 ifeq ($(GPU_TYPE), t83x)
        LOCAL_KK=1
 endif
-
+TEST_DIR=$(dir $(lastword $(MAKEFILE_LIST)))
+MESON_GPU_DIR?=hardware/arm/gpu
 GPU_MODS_OUT?=system/lib
 ifeq ($(LOCAL_KK),0)
 GPU_DRV_VERSION?=r6p1
 GPU_DRV_VERSION:=$(strip $(GPU_DRV_VERSION))
-MALI_PLAT=hardware/arm/gpu/utgard/platform
-MALI=hardware/arm/gpu/utgard/${GPU_DRV_VERSION}
+MALI_PLAT=$(MESON_GPU_DIR)/utgard/platform
+MALI=$(MESON_GPU_DIR)/utgard/${GPU_DRV_VERSION}
 MALI_OUT=$(PRODUCT_OUT)/obj/mali
 KERNEL_ARCH ?= arm
 #TODO rm shell cmd
@@ -54,6 +55,7 @@ $(MALI_KO):
        mkdir -p $(MALI_OUT)
        cp $(MALI)/* $(MALI_OUT)/ -airf
        cp $(MALI_PLAT) $(MALI_OUT)/ -airf
+       @echo "test dir is $(TEST_DIR)"
        @echo "make mali module KERNEL_ARCH is $(KERNEL_ARCH)"
        @echo "make mali module MALI_OUT is $(MALI_OUT)"
        @echo "make mali module MAKE is $(MAKE)"
@@ -72,7 +74,7 @@ else
 
 GPU_DRV_VERSION?=r11p0
 GPU_DRV_VERSION:=$(strip $(GPU_DRV_VERSION))
-MALI=hardware/arm/gpu/midgard/${GPU_DRV_VERSION}
+MALI=$(MESON_GPU_DIR)/midgard/${GPU_DRV_VERSION}
 MALI_OUT=$(PRODUCT_OUT)/obj/t83x
 KERNEL_ARCH ?= arm
 

diff --git a/utgard/Makefile b/utgard/Makefile
index a9d814ca8c93156a28277e0db65e905527831fd6..ab68956ba55ea9f48fb48c511b5bf568769dd1a7 100644 (file)
--- a/utgard/Makefile
+++ b/utgard/Makefile
@@ -3,7 +3,7 @@ $(warning MAKEFILE_LIST is $(MAKEFILE_LIST))
 
 GPU_DRV_VERSION?=r7p0
 
-KDIR?=/home/jiyu.yang/source/br-wayland/output/meson8b_m201/build/linux/
+KDIR?=${HOME}/source/br-wayland/output/meson8b_m201/build/linux/
 ARCH?=arm
 CROSS_COMPILE?=arm-linux-gnueabihf-
 MALI400?=m