gator: Version 5.17

Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Alex Shi <alex.shi@linaro.org>

Conflicts:
	drivers/gator/Makefile

1 files changed, 32 insertions, 32 deletions

diff --git a/drivers/gator/Makefile b/drivers/gator/Makefile
index 942e415677b..3dc9d059a4b 100644
--- a/drivers/gator/Makefile
+++ b/drivers/gator/Makefile
@@ -12,24 +12,40 @@ gator-y :=	gator_main.o \
 		gator_events_net.o \
 		gator_events_block.o \
 		gator_events_meminfo.o \
-		gator_events_perf_pmu.o
-
-gator-y +=	gator_events_mmaped.o
+		gator_events_perf_pmu.o \
+		gator_events_mmapped.o \
+
+# Convert the old GATOR_WITH_MALI_SUPPORT to the new kernel flags
+ifneq ($(GATOR_WITH_MALI_SUPPORT),)
+  CONFIG_GATOR_WITH_MALI_SUPPORT := y
+  ifeq ($(GATOR_WITH_MALI_SUPPORT),MALI_T6xx)
+    CONFIG_GATOR_MALI_4XXMP := n
+    CONFIG_GATOR_MALI_T6XX := y
+  else
+    CONFIG_GATOR_MALI_4XXMP := y
+    CONFIG_GATOR_MALI_T6XX := n
+  endif
+  EXTRA_CFLAGS += -DMALI_SUPPORT=$(GATOR_WITH_MALI_SUPPORT)
+  ifneq ($(GATOR_MALI_INTERFACE_STYLE),)
+    EXTRA_CFLAGS += -DGATOR_MALI_INTERFACE_STYLE=$(GATOR_MALI_INTERFACE_STYLE)
+  endif
+endif
 
 ifeq ($(CONFIG_GATOR_WITH_MALI_SUPPORT),y)
-
-ifeq ($(CONFIG_GATOR_MALI_T6XX),y)
-gator-y +=	gator_events_mali_t6xx.o \
+  ifeq ($(CONFIG_GATOR_MALI_T6XX),y)
+    gator-y +=	gator_events_mali_t6xx.o \
 		gator_events_mali_t6xx_hw.o
-include $(M)/mali_t6xx.mk
-else
-gator-y +=	gator_events_mali_4xx.o
-endif
-gator-y +=	gator_events_mali_common.o
-
-ccflags-y += -I$(CONFIG_GATOR_MALI_PATH)
-ccflags-$(CONFIG_GATOR_MALI_400MP) += -DMALI_SUPPORT=MALI_400
-ccflags-$(CONFIG_GATOR_MALI_T6XX) += -DMALI_SUPPORT=MALI_T6xx
+    include $(src)/mali_t6xx.mk
+  else
+    gator-y +=	gator_events_mali_4xx.o
+  endif
+  gator-y +=	gator_events_mali_common.o
+
+  ifneq ($(CONFIG_GATOR_MALI_PATH),)
+    ccflags-y += -I$(CONFIG_GATOR_MALI_PATH)
+  endif
+  ccflags-$(CONFIG_GATOR_MALI_4XXMP) += -DMALI_SUPPORT=MALI_4xx
+  ccflags-$(CONFIG_GATOR_MALI_T6XX) += -DMALI_SUPPORT=MALI_T6xx
 endif
 
 # GATOR_TEST controls whether to include (=1) or exclude (=0) test code. 
@@ -44,22 +60,6 @@ gator-$(CONFIG_ARM) +=	gator_events_armv6.o \
 
 gator-$(CONFIG_ARM64) +=	gator_events_ccn-504.o
 
-$(obj)/gator_main.o: $(obj)/gator_events.h
-
-clean-files := gator_events.h
-
-# Note, in the recipe below we use "cd $(srctree) && cd $(src)" rather than
-# "cd $(srctree)/$(src)" because under DKMS  $(src) is an absolute path, and we
-# can't just use $(src) because for normal kernel builds this is relative to
-# $(srctree)
-
-       chk_events.h = :
- quiet_chk_events.h = echo '  CHK     $@'
-silent_chk_events.h = :
-$(obj)/gator_events.h: FORCE
-	@$($(quiet)chk_events.h)
-	$(Q)cd $(srctree) && cd $(src) ; $(CONFIG_SHELL) gator_events.sh $(abspath $@)
-
 else
 
 all:
@@ -70,7 +70,7 @@ all:
 	$(error)
 
 clean:
-	rm -f *.o .*.cmd gator_events.h modules.order Module.symvers gator.ko gator.mod.c
+	rm -f *.o .*.cmd modules.order Module.symvers gator.ko gator.mod.c
 	rm -rf .tmp_versions
 
 endif