diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-05-10 17:35:03 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-10-25 16:23:22 +0100 |
| commit | 627fd43275275311d6d0434d860c0cb43585632d (patch) | |
| tree | 4aa3709096f1c9cfd337f6802c50f87681f5b5f6 | |
| parent | 7427e5a91621a78578769a4d309233ce1205e2fa (diff) | |
gator: Add config for building the module in-tree
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gator/Kconfig | 33 | ||||
| -rw-r--r-- | drivers/gator/Makefile | 14 |
4 files changed, 46 insertions, 5 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index ece958d3762..f06225dc47d 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -152,4 +152,6 @@ source "drivers/vme/Kconfig" source "drivers/pwm/Kconfig" +source "drivers/gator/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 5b421840c48..cebc9be89fa 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -139,3 +139,5 @@ obj-$(CONFIG_EXTCON) += extcon/ obj-$(CONFIG_MEMORY) += memory/ obj-$(CONFIG_IIO) += iio/ obj-$(CONFIG_VME_BUS) += vme/ + +obj-$(CONFIG_GATOR) += gator/ diff --git a/drivers/gator/Kconfig b/drivers/gator/Kconfig new file mode 100644 index 00000000000..14b3d619d18 --- /dev/null +++ b/drivers/gator/Kconfig @@ -0,0 +1,33 @@ +config GATOR + tristate "Gator module for ARM's Streamline Performance Analyzer" + default m + depends on PROFILING + depends on HIGH_RES_TIMERS + depends on LOCAL_TIMERS || !(ARM && SMP) + select TRACING + +config GATOR_WITH_MALI_SUPPORT + bool + +choice + prompt "Enable Mali GPU support in Gator" + depends on GATOR + optional + +config GATOR_MALI_400MP + bool "Mali-400MP" + select GATOR_WITH_MALI_SUPPORT + +config GATOR_MALI_T6XX + bool "Mali-T604 or Mali-T658" + select GATOR_WITH_MALI_SUPPORT + +endchoice + +config GATOR_MALI_PATH + string "Path to Mali driver" + depends on GATOR_WITH_MALI_SUPPORT + default "drivers/gpu/arm/mali400mp" + help + The gator code adds this to its include path so it can get the Mali + trace headers with: #include "linux/mali_linux_trace.h" diff --git a/drivers/gator/Makefile b/drivers/gator/Makefile index 6cafecf337d..24379eafbd3 100644 --- a/drivers/gator/Makefile +++ b/drivers/gator/Makefile @@ -3,7 +3,7 @@ ifneq ($(KERNELRELEASE),) # Uncomment the following line to enable kernel stack unwinding within gator, or update gator_backtrace.c # EXTRA_CFLAGS += -DGATOR_KERNEL_STACK_UNWINDING -obj-m := gator.o +obj-$(CONFIG_GATOR) := gator.o gator-y := gator_main.o \ gator_events_irq.o \ @@ -15,8 +15,9 @@ gator-y := gator_main.o \ gator-y += gator_events_mmaped.o -ifneq ($(GATOR_WITH_MALI_SUPPORT),) -ifeq ($(GATOR_WITH_MALI_SUPPORT),MALI_T6xx) +ifeq ($(CONFIG_GATOR_WITH_MALI_SUPPORT),y) + +ifeq ($(CONFIG_GATOR_MALI_T6XX),y) gator-y += gator_events_mali_t6xx.o \ gator_events_mali_t6xx_hw.o include $(M)/mali_t6xx.mk @@ -24,7 +25,10 @@ else gator-y += gator_events_mali_400.o endif gator-y += gator_events_mali_common.o -EXTRA_CFLAGS += -DMALI_SUPPORT=$(GATOR_WITH_MALI_SUPPORT) + +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 endif # GATOR_TEST controls whether to include (=1) or exclude (=0) test code. @@ -45,7 +49,7 @@ clean-files := gator_events.h silent_chk_events.h = : gator_events.h: FORCE @$($(quiet)chk_events.h) - $(Q)cd $(obj) ; $(CONFIG_SHELL) $(obj)/gator_events.sh $@ + $(Q)cd $(srctree)/$(src) ; $(CONFIG_SHELL) gator_events.sh $(objtree)/$(obj)/$@ else |