diff --git a/configure.ac b/configure.ac index a047436b3..84138d15e 100644 --- a/configure.ac +++ b/configure.ac @@ -841,6 +841,7 @@ case ${with_examples} in da15000) OPENTHREAD_EXAMPLES_DA15000=1 + AC_DEFINE_UNQUOTED([OPENTHREAD_EXAMPLES_DA15000],[${OPENTHREAD_EXAMPLES_DA15000}],[Define to 1 if you want to use da15000 examples]) ;; esac @@ -857,6 +858,9 @@ AM_CONDITIONAL([OPENTHREAD_EXAMPLES_POSIX], [test "${OPENTHREAD_EXAMPLES}" = "po AC_SUBST(OPENTHREAD_EXAMPLES_CC2538) AM_CONDITIONAL([OPENTHREAD_EXAMPLES_CC2538], [test "${OPENTHREAD_EXAMPLES}" = "cc2538"]) +AC_SUBST(OPENTHREAD_EXAMPLES_DA15000) +AM_CONDITIONAL([OPENTHREAD_EXAMPLES_DA15000], [test "${OPENTHREAD_EXAMPLES}" = "da15000"]) + # # Platform Information # @@ -876,10 +880,6 @@ if test "$PLATFORM_INFO" != "none"; then AC_DEFINE_UNQUOTED([PLATFORM_INFO],["${PLATFORM_INFO}"],[OpenThread platform information]) fi -AC_SUBST(OPENTHREAD_EXAMPLES_DA15000) -AM_CONDITIONAL([OPENTHREAD_EXAMPLES_DA15000], [test "${OPENTHREAD_EXAMPLES}" = "da15000"]) -AC_DEFINE_UNQUOTED([OPENTHREAD_EXAMPLES_DA15000],[${OPENTHREAD_EXAMPLES_DA15000}],[Define to 1 if you want to use da15000 examples]) - # # Tools # diff --git a/examples/Makefile-da15000 b/examples/Makefile-da15000 index e04cc6535..7dc660f20 100644 --- a/examples/Makefile-da15000 +++ b/examples/Makefile-da15000 @@ -24,7 +24,7 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. - +# .NOTPARALLEL: @@ -39,16 +39,16 @@ NM = arm-none-eabi-nm RANLIB = arm-none-eabi-ranlib OBJCOPY = arm-none-eabi-objcopy +BuildJobs ?= 99 + configure_OPTIONS = \ --enable-cli \ --enable-ncp \ + --enable-default-logging \ --with-examples=da15000 \ + --with-platform-info=DA15000 \ $(NULL) -ifeq ($(CLI_LOGGING),1) -configure_OPTIONS += --enable-cli-logging -endif - ifeq ($(CERT_LOG),1) configure_OPTIONS += --enable-cert-log endif @@ -69,31 +69,31 @@ ifeq ($(DHCP6_CLIENT),1) configure_OPTIONS += --enable-dhcp6-client endif -COMMONCFLAGS = \ +COMMONCFLAGS := \ -fdata-sections \ -ffunction-sections \ -Os \ -g \ $(NULL) -CPPFLAGS = \ +CPPFLAGS += \ $(COMMONCFLAGS) \ $(target_CPPFLAGS) \ $(NULL) -CFLAGS = \ +CFLAGS += \ $(COMMONCFLAGS) \ $(target_CFLAGS) \ $(NULL) -CXXFLAGS = \ +CXXFLAGS += \ $(COMMONCFLAGS) \ $(target_CXXFLAGS) \ -fno-exceptions \ -fno-rtti \ $(NULL) -LDFLAGS = \ +LDFLAGS += \ $(COMMONCFLAGS) \ $(target_LDFLAGS) \ -nostartfiles \ @@ -129,6 +129,11 @@ ARCHS = cortex-m0 TopTargetLibDir = $(TopResultDir)/$(if $(1),$(1)-,)$(TargetTuple)/lib +ifndef BuildJobs +BuildJobs := $(shell getconf _NPROCESSORS_ONLN) +endif +JOBSFLAG := -j$(BuildJobs) + # # configure-arch # @@ -157,7 +162,7 @@ endef # configure-arch # define build-arch $(ECHO) " BUILD $(1)-$(TargetTuple)" -$(MAKE) -C $(BuildPath)/$(1)-$(TargetTuple) --no-print-directory \ +$(MAKE) $(JOBSFLAG) -C $(BuildPath)/$(1)-$(TargetTuple) --no-print-directory \ all endef # build-arch @@ -171,7 +176,7 @@ endef # build-arch # define stage-arch $(ECHO) " STAGE $(1)-$(TargetTuple)" -$(MAKE) -C $(BuildPath)/$(1)-$(TargetTuple) --no-print-directory \ +$(MAKE) $(JOBSFLAG) -C $(BuildPath)/$(1)-$(TargetTuple) --no-print-directory \ DESTDIR=$(AbsTopResultDir) \ install endef # stage-arch @@ -204,7 +209,7 @@ $(BuildPath)/$(1)-$(TargetTuple)/config.status: | $(BuildPath)/$(1)-$(TargetTupl do-build-$(1): configure-$(1) do-build-$(1): - $$(call build-arch,$(1)) + +$$(call build-arch,$(1)) stage-$(1): do-build-$(1) diff --git a/examples/apps/cli/Makefile.am b/examples/apps/cli/Makefile.am index c47cb6dbe..f65d0c79d 100644 --- a/examples/apps/cli/Makefile.am +++ b/examples/apps/cli/Makefile.am @@ -87,7 +87,7 @@ LDADD_COMMON += \ LDFLAGS_COMMON += \ -T $(top_srcdir)/examples/platforms/da15000/da15000.ld \ $(NULL) -endif +endif # OPENTHREAD_EXAMPLES_DA15000 ot_cli_ftd_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ diff --git a/examples/apps/ncp/Makefile.am b/examples/apps/ncp/Makefile.am index b99265006..14feb4e81 100644 --- a/examples/apps/ncp/Makefile.am +++ b/examples/apps/ncp/Makefile.am @@ -63,7 +63,7 @@ ot_ncp_LDADD += \ $(top_builddir)/examples/platforms/posix/libopenthread-posix.a \ -lstdc++ \ $(NULL) -endif +endif # OPENTHREAD_EXAMPLES_POSIX if OPENTHREAD_EXAMPLES_CC2538 ot_ncp_LDADD += \ @@ -73,7 +73,7 @@ ot_ncp_LDADD += \ ot_ncp_LDFLAGS += \ -T $(top_srcdir)/examples/platforms/cc2538/cc2538.ld \ $(NULL) -endif +endif # OPENTHREAD_EXAMPLES_CC2538 if OPENTHREAD_EXAMPLES_DA15000 ot_ncp_LDADD += \ @@ -83,7 +83,7 @@ ot_ncp_LDADD += \ ot_ncp_LDFLAGS += \ -T $(top_srcdir)/examples/platforms/da15000/da15000.ld \ $(NULL) -endif +endif # OPENTHREAD_EXAMPLES_DA15000 ot_ncp_SOURCES = \ main.c \ diff --git a/examples/platforms/Makefile.am b/examples/platforms/Makefile.am index a84b74f88..c7c2afa74 100644 --- a/examples/platforms/Makefile.am +++ b/examples/platforms/Makefile.am @@ -52,7 +52,7 @@ SUBDIRS += cc2538 endif if OPENTHREAD_EXAMPLES_DA15000 -SUBDIRS = da15000 +SUBDIRS += da15000 endif # Always pretty (e.g. for 'make pretty') these subdirectories. diff --git a/examples/platforms/da15000/Makefile.am b/examples/platforms/da15000/Makefile.am index 950e5b561..f37de8a7c 100755 --- a/examples/platforms/da15000/Makefile.am +++ b/examples/platforms/da15000/Makefile.am @@ -28,55 +28,47 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am +lib_LIBRARIES = libopenthread-da15000.a -lib_LIBRARIES = libopenthread-da15000.a - -libopenthread_da15000_a_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/examples/platforms \ - -I$(top_srcdir)/src/core \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/include \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/peripherals/include \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/adapters/include \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/memory/include \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/interfaces/ftdf/include \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/config \ - -I$(top_srcdir)/third_party/dialog/DialogSDK \ - -I$(top_srcdir)/third_party/dialog/DialogSDK/interfaces/ftdf/src \ - -include$(top_srcdir)/examples/platforms/da15000/custom_config_qspi.h \ - -Wno-unknown-pragmas \ - -Wno-sign-compare \ - -Wno-unused-function \ - -Wno-unused-parameter \ - -Wno-shadow \ - -Wno-type-limits \ - -Wno-unused-variable \ - -Wno-missing-field-initializers \ - -fno-strict-aliasing \ +libopenthread_da15000_a_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/examples/platforms \ + -I$(top_srcdir)/src/core \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/include \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/peripherals/include \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/adapters/include \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/memory/include \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/interfaces/ftdf/include \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/bsp/config \ + -I$(top_srcdir)/third_party/dialog/DialogSDK \ + -I$(top_srcdir)/third_party/dialog/DialogSDK/interfaces/ftdf/src \ + -include$(top_srcdir)/examples/platforms/da15000/custom_config_qspi.h \ + -Wno-unknown-pragmas \ + -Wno-sign-compare \ + -Wno-unused-function \ + -Wno-unused-parameter \ + -Wno-shadow \ + -Wno-type-limits \ + -Wno-unused-variable \ + -Wno-missing-field-initializers \ + -fno-strict-aliasing \ $(NULL) - -libopenthread_da15000_settings.cpp: $(srcdir)/../utils/settings.cpp - cp $? $@ - -CLEANFILES = libopenthread_da15000_settings.cpp - -libopenthread_da15000_a_SOURCES = \ - alarm.c \ - flash.c \ - logging.c \ - platform.c \ - radio.c \ - random.c \ - vector.c \ - cstartup.c \ - uart.c \ - cortex-m_cstartup.c \ - startup-gcc.c \ - libopenthread_da15000_settings.cpp \ - clock.c \ - misc.c \ - @top_builddir@/third_party/dialog/DialogSDK/bsp/memory/src/qspi_automode.c \ +libopenthread_da15000_a_SOURCES = \ + alarm.c \ + flash.c \ + logging.c \ + platform.c \ + radio.c \ + random.c \ + vector.c \ + cstartup.c \ + uart.c \ + cortex-m_cstartup.c \ + startup-gcc.c \ + clock.c \ + misc.c \ + @top_builddir@/third_party/dialog/DialogSDK/bsp/memory/src/qspi_automode.c \ @top_builddir@/third_party/dialog/DialogSDK/bsp/peripherals/src/hw_qspi.c \ @top_builddir@/third_party/dialog/DialogSDK/bsp/peripherals/src/hw_timer0.c \ @top_builddir@/third_party/dialog/DialogSDK/bsp/peripherals/src/hw_gpio.c \ @@ -98,14 +90,13 @@ libopenthread_da15000_a_SOURCES = @top_builddir@/third_party/dialog/DialogSDK/interfaces/ftdf/src/main.c \ $(NULL) - - -noinst_HEADERS = \ - platform-da15000.h \ +noinst_HEADERS = \ + custom_config_qspi.h \ + platform-da15000.h \ $(NULL) -if OPENTHREAD_BUILD_COVERAGE -CLEANFILES += $(wildcard *.gcda *.gcno) -endif # OPENTHREAD_BUILD_COVERAGE +Dash = - +libopenthread_da15000_a_LIBADD = \ + $(shell find $(top_builddir)/examples/platforms/utils $(Dash)type f $(Dash)name "*.o") include $(abs_top_nlbuild_autotools_dir)/automake/post.am diff --git a/third_party/Makefile.am b/third_party/Makefile.am index bed966f64..9c0dabd50 100644 --- a/third_party/Makefile.am +++ b/third_party/Makefile.am @@ -29,6 +29,7 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am EXTRA_DIST = \ + dialog \ nlbuild-autotools \ openthread-test-driver \ $(NULL)