From bb281f03f3260f48f11cdec7d4dedc43ed4d48a0 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Fri, 4 Sep 2015 11:35:55 -0700 Subject: [PATCH] Added DSPAL as a git submodule of PX4 The DSPAL headers are required to build for qurt. When we move to a cmake build system, the DSPAL headers can be conditionally included. Signed-off-by: Mark Charlebois --- .gitmodules | 3 +++ makefiles/qurt/toolchain_hexagon.mk | 15 +++------------ src/lib/dspal | 1 + 3 files changed, 7 insertions(+), 12 deletions(-) create mode 160000 src/lib/dspal diff --git a/.gitmodules b/.gitmodules index 3e6e75cb0e..cb9a6ccf05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "src/lib/eigen"] path = src/lib/eigen url = https://github.com/PX4/eigen.git +[submodule "src/lib/dspal"] + path = src/lib/dspal + url = https://github.com/mcharleb/dspal.git diff --git a/makefiles/qurt/toolchain_hexagon.mk b/makefiles/qurt/toolchain_hexagon.mk index a06a13a511..77a9d4e838 100644 --- a/makefiles/qurt/toolchain_hexagon.mk +++ b/makefiles/qurt/toolchain_hexagon.mk @@ -35,14 +35,6 @@ #$(info TOOLCHAIN gnu-arm-eabi) -# -# Stop making if DSPAL paths are not set. This defines the path to -# DspAL headers and libs -# -ifndef DSPAL_INCS -$(error DSPAL_INCS is not set) -endif - # Toolchain commands. Normally only used inside this file. # HEXAGON_TOOLS_ROOT ?= /opt/6.4.03 @@ -57,6 +49,7 @@ HEXAGON_ISS_DIR = $(HEXAGON_TOOLS_ROOT)/qc/lib/iss TOOLSLIB = $(HEXAGON_TOOLS_ROOT)/dinkumware/lib/$(V_ARCH)/G0 QCTOOLSLIB = $(HEXAGON_TOOLS_ROOT)/qc/lib/$(V_ARCH)/G0 QURTLIB = $(HEXAGON_SDK_ROOT)/lib/common/qurt/ADSP$(V_ARCH)MP/lib +DSPAL_INCS ?= $(PX4_BASE)/src/lib/dspal CC = $(HEXAGON_CLANG_BIN)/$(CROSSDEV)clang @@ -121,10 +114,8 @@ ARCHDEFINES += -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD) \ -D__EXPORT= \ -Drestrict= \ -D_DEBUG \ - -I$(DSPAL_INCS)/ \ - -I$(DSPAL_INCS)/dspal/include \ - -I$(DSPAL_INCS)/dspal/sys \ - -I$(DSPAL_INCS)/dspal/sys/sys \ + -I$(DSPAL_INCS)/include \ + -I$(DSPAL_INCS)/sys \ -I$(HEXAGON_TOOLS_ROOT)/gnu/hexagon/include \ -I$(PX4_BASE)/src/lib/eigen \ -I$(PX4_BASE)/src/platforms/qurt/include \ diff --git a/src/lib/dspal b/src/lib/dspal new file mode 160000 index 0000000000..1741154446 --- /dev/null +++ b/src/lib/dspal @@ -0,0 +1 @@ +Subproject commit 1741154446c7c92c6e632d7ee1619c6d4174bf2d