espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-30 13:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of DA15000 build files. (#1111)

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