espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-02 17:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support #1619 - MTD vrs FTD builds, and Makefile.am If/Else/Endif issues (#1620)

Browse Source 
* Convert FTD/MTD methods and remove if/else/endif from Makefiles
This commit is contained in:
DuaneEllis-TI
2017-04-20 20:55:40 -07:00
committed by Jonathan Hui
parent 79ab4b7c0b
commit 358ca8ee77
76 changed files with 714 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/Makefile-cc2538
+3 -3
View File
@@ -42,9 +42,9 @@ OBJCOPY = arm-none-eabi-objcopy
BuildJobs ?= 10
configure_OPTIONS = \
--enable-ftd \
--enable-cli \
--enable-ncp \
--enable-cli-app=all \
--enable-ncp-app=all \
--with-ncp-bus=uart \
--enable-diag \
--enable-default-logging \
--with-examples=cc2538 \
examples/Makefile-cc2650
+3 -2
View File
@@ -42,8 +42,9 @@ OBJCOPY = arm-none-eabi-objcopy
BuildJobs ?= 10
configure_OPTIONS = \
--enable-cli \
--enable-ncp \
--enable-cli-app=mtd \
--enable-ncp-app=mtd \
--with-ncp-bus=uart \
--with-examples=cc2650 \
--with-platform-info=cc2650 \
MBEDTLS_CPPFLAGS="$(CC2650_MBEDTLS_CPPFLAGS)" \
examples/Makefile-da15000
+3 -3
View File
@@ -42,9 +42,9 @@ OBJCOPY = arm-none-eabi-objcopy
BuildJobs ?= 10
configure_OPTIONS = \
--enable-ftd \
--enable-cli \
--enable-ncp \
--enable-cli-app=all \
--enable-ncp-app=all \
--with-ncp-bus=uart \
--enable-default-logging \
--with-examples=da15000 \
--with-platform-info=DA15000 \
examples/Makefile-nrf52840
+3 -3
View File
@@ -42,9 +42,9 @@ OBJCOPY = arm-none-eabi-objcopy
BuildJobs ?= 10
configure_OPTIONS = \
--enable-ftd \
--enable-cli \
--enable-ncp \
--enable-cli-app=all \
--enable-ncp-app=all \
--with-ncp-bus=uart \
--enable-diag \
--with-examples=nrf52840 \
--with-platform-info=NRF52840 \
examples/Makefile-posix
+3 -3
View File
@@ -82,9 +82,9 @@ TargetTuple = $(shell ${AbsTopSourceDir}/third_party/nlbuild
# accordingly.
configure_OPTIONS = \
--enable-ftd \
--enable-cli \
--enable-ncp \
--enable-cli-app=all \
--enable-ncp-app=all \
--with-ncp-bus=uart \
--enable-diag \
--enable-default-logging \
--enable-raw-link-api=no \
examples/apps/cli/Makefile.am
+7 -4
View File
@@ -112,17 +112,19 @@ LDFLAGS_COMMON += \
$(NULL)
endif
if OPENTHREAD_ENABLE_FTD
if OPENTHREAD_ENABLE_CLI_FTD
bin_PROGRAMS += \
ot-cli-ftd \
$(NULL)
endif
ot_cli_ftd_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(NULL)
ot_cli_ftd_LDADD = \
$(top_builddir)/src/cli/libopenthread-cli.a \
$(top_builddir)/src/cli/libopenthread-cli-ftd.a \
$(top_builddir)/src/core/libopenthread-ftd.a \
$(LDADD_COMMON) \
$(NULL)
@@ -134,18 +136,19 @@ ot_cli_ftd_LDFLAGS = \
ot_cli_ftd_SOURCES = \
$(SOURCES_COMMON) \
$(NULL)
endif # OPENTHREAD_ENABLE_FTD
if OPENTHREAD_ENABLE_CLI_MTD
bin_PROGRAMS += \
ot-cli-mtd \
$(NULL)
endif
ot_cli_mtd_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(NULL)
ot_cli_mtd_LDADD = \
$(top_builddir)/src/cli/libopenthread-cli.a \
$(top_builddir)/src/cli/libopenthread-cli-mtd.a \
$(top_builddir)/src/core/libopenthread-mtd.a \
$(LDADD_COMMON) \
$(NULL)
examples/apps/ncp/Makefile.am
+8 -4
View File
@@ -112,17 +112,20 @@ LDFLAGS_COMMON += \
$(NULL)
endif
if OPENTHREAD_ENABLE_FTD
if OPENTHREAD_ENABLE_NCP_FTD
bin_PROGRAMS += \
ot-ncp-ftd \
$(NULL)
endif
ot_ncp_ftd_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(NULL)
ot_ncp_ftd_LDADD = \
$(top_builddir)/src/ncp/libopenthread-ncp.a \
$(top_builddir)/src/ncp/libopenthread-ncp-ftd.a \
$(top_builddir)/src/core/libopenthread-ftd.a \
$(LDADD_COMMON) \
$(NULL)
@@ -134,18 +137,19 @@ ot_ncp_ftd_LDFLAGS = \
ot_ncp_ftd_SOURCES = \
$(SOURCES_COMMON) \
$(NULL)
endif # OPENTHREAD_ENABLE_FTD
if OPENTHREAD_ENABLE_NCP_MTD
bin_PROGRAMS += \
ot-ncp-mtd \
$(NULL)
endif
ot_ncp_mtd_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(NULL)
ot_ncp_mtd_LDADD = \
$(top_builddir)/src/ncp/libopenthread-ncp.a \
$(top_builddir)/src/ncp/libopenthread-ncp-mtd.a \
$(top_builddir)/src/core/libopenthread-mtd.a \
$(LDADD_COMMON) \
$(NULL)