summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorIván Briano <ivan.briano@intel.com>2016-07-07 11:08:57 -0300
committerAndrew Boie <andrew.p.boie@intel.com>2016-07-18 18:47:51 +0000
commitc13a9cb02b205dd589be2c8527ff7e5c662f9c99 (patch)
treee90366fedb33c245ec4566d0290bb67c3bd0ecbc /ext
parentce2574a30beed18a0a137f5d33d88c42b63781ee (diff)
ext qmsi: Make QMSI headers available to more than just drivers
QMSI provides more than just peripheral drivers, and it may be used from the SOC or by applications that need finer grained control of the platform. This also makes the QMSI HAL consistent with the others. Change-Id: I27490c98ccf1c1afcc090ce1e65f0e066eddc777 Signed-off-by: Iván Briano <ivan.briano@intel.com>
Diffstat (limited to 'ext')
-rw-r--r--ext/hal/qmsi/Kbuild2
-rw-r--r--ext/hal/qmsi/Makefile9
-rw-r--r--ext/hal/qmsi/Makefile.include6
3 files changed, 9 insertions, 8 deletions
diff --git a/ext/hal/qmsi/Kbuild b/ext/hal/qmsi/Kbuild
index 448990083..6d4a3bd01 100644
--- a/ext/hal/qmsi/Kbuild
+++ b/ext/hal/qmsi/Kbuild
@@ -1,7 +1,5 @@
subdir-ccflags-$(CONFIG_QMSI_BUILTIN) +=-DISR_HANDLED
-include $(srctree)/ext/hal/qmsi/Makefile.include
-
obj-$(CONFIG_QMSI_BUILTIN) += drivers/clk.o
ifeq ($(CONFIG_ARC),y)
obj-$(CONFIG_QMSI_BUILTIN) += drivers/sensor/ss_clk.o
diff --git a/ext/hal/qmsi/Makefile b/ext/hal/qmsi/Makefile
index 47e2616aa..9f64048eb 100644
--- a/ext/hal/qmsi/Makefile
+++ b/ext/hal/qmsi/Makefile
@@ -1,5 +1,14 @@
ifdef CONFIG_QMSI_LIBRARY
+ZEPHYRINCLUDE += -I$(CONFIG_QMSI_INSTALL_PATH)/include
LIB_INCLUDE_DIR += -L$(CONFIG_QMSI_INSTALL_PATH:"%"=%)/lib
ALL_LIBS += qmsi
endif
+ifdef CONFIG_QMSI_BUILTIN
+ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/qmsi/include
+ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/qmsi/drivers/include
+ifeq ($(CONFIG_ARC),y)
+ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/qmsi/drivers/sensor/include
+endif
+ZEPHYRINCLUDE +=-I$(srctree)/ext/hal/qmsi/soc/$(patsubst %_ss,%,$(SOC_NAME))/include/
+endif
diff --git a/ext/hal/qmsi/Makefile.include b/ext/hal/qmsi/Makefile.include
deleted file mode 100644
index 9a3bf561c..000000000
--- a/ext/hal/qmsi/Makefile.include
+++ /dev/null
@@ -1,6 +0,0 @@
-subdir-ccflags-$(CONFIG_QMSI_LIBRARY) += -I$(CONFIG_QMSI_INSTALL_PATH)/include
-subdir-ccflags-$(CONFIG_QMSI_BUILTIN) +=-I$(srctree)/ext/hal/qmsi/include
-subdir-ccflags-$(CONFIG_QMSI_BUILTIN) +=-I$(srctree)/ext/hal/qmsi/drivers/include
-subdir-ccflags-$(CONFIG_QMSI_BUILTIN) +=-I$(srctree)/ext/hal/qmsi/soc/$(SOC_NAME)/include/
-subdir-ccflags-$(CONFIG_QMSI_BUILTIN) +=-I$(srctree)/ext/hal/qmsi/drivers/sensor/include
-subdir-ccflags-$(CONFIG_QMSI_BUILTIN) +=-I$(srctree)/ext/hal/qmsi/soc/quark_se/include/