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

[configure] replace --with-platform-info using project config (#2077)

Browse Source
This commit is contained in:
Jonathan Hui
2017-08-08 22:10:07 -07:00
committed by GitHub
parent 35848351b5
commit 5ecab16f86
24 changed files with 155 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
-18
View File
@@ -1236,24 +1236,6 @@ AM_CONDITIONAL([OPENTHREAD_EXAMPLES_KW41Z], [test "${OPENTHREAD_EXAMPLES}" = "kw
AC_SUBST(OPENTHREAD_EXAMPLES_NRF52840)
AM_CONDITIONAL([OPENTHREAD_EXAMPLES_NRF52840], [test "${OPENTHREAD_EXAMPLES}" = "nrf52840"])
#
# Platform Information
#
AC_ARG_WITH(platform-info,
[AS_HELP_STRING([--with-platform-info=PLATFORM],
[Specify the platform information @<:@default=none@:>@.])],
[],
[with_platform_info=none])
PLATFORM_INFO=${with_platform_info}
AC_MSG_CHECKING([with platform info])
AC_MSG_RESULT(${PLATFORM_INFO})
AC_SUBST(PLATFORM_INFO)
AC_DEFINE_UNQUOTED([PLATFORM_INFO],["${PLATFORM_INFO}"],[OpenThread platform information])
#
# Tools
#
examples/Makefile-cc2538
-1
View File
@@ -47,7 +47,6 @@ configure_OPTIONS = \
--with-ncp-bus=uart \
--enable-diag \
--with-examples=cc2538 \
--with-platform-info=CC2538 \
--enable-linker-map \
$(NULL)
examples/Makefile-cc2650
-1
View File
@@ -46,7 +46,6 @@ configure_OPTIONS = \
--enable-ncp-app=mtd \
--with-ncp-bus=uart \
--with-examples=cc2650 \
--with-platform-info=cc2650 \
--enable-linker-map \
MBEDTLS_CPPFLAGS="$(CC2650_MBEDTLS_CPPFLAGS)" \
$(NULL)
examples/Makefile-cc2652
-1
View File
@@ -47,7 +47,6 @@ configure_OPTIONS = \
--with-ncp-bus=uart \
--enable-diag \
--with-examples=cc2652 \
--with-platform-info=cc2652 \
MBEDTLS_CPPFLAGS="$(CC2652_MBEDTLS_CPPFLAGS)" \
$(NULL)
examples/Makefile-efr32
-1
View File
@@ -47,7 +47,6 @@ configure_OPTIONS = \
--with-ncp-bus=uart \
--enable-diag \
--with-examples=efr32 \
--with-platform-info=EFR32 \
--enable-linker-map \
MBEDTLS_CPPFLAGS="$(EFR32_MBEDTLS_CPPFLAGS)" \
$(NULL)
examples/Makefile-emsk
-1
View File
@@ -46,7 +46,6 @@ configure_OPTIONS = \
--enable-ncp-app=all \
--with-ncp-bus=uart \
--with-examples=emsk \
--with-platform-info=EMSK \
--enable-linker-map \
$(NULL)
examples/Makefile-gp712
-2
View File
@@ -30,7 +30,6 @@
TARGET = arm-bcm2708hardfp-linux-gnueabi
PPREFIX = gp712
INFO = GP712
#CROSS_COMPILE = $(TARGET)-
AR = $(CROSS_COMPILE)ar
@@ -50,7 +49,6 @@ configure_OPTIONS = \
--enable-cli-app=ftd \
--enable-diag \
--with-examples=$(PPREFIX) \
--with-platform-info=$(INFO) \
$(NULL)
DEFAULT_LOGGING ?= 1
examples/Makefile-kw41z
-1
View File
@@ -47,7 +47,6 @@ configure_OPTIONS = \
--with-ncp-bus=uart \
--enable-diag \
--with-examples=kw41z \
--with-platform-info=KW41Z \
--enable-linker-map \
$(NULL)
examples/Makefile-nrf52840
-1
View File
@@ -47,7 +47,6 @@ configure_OPTIONS = \
--with-ncp-bus=uart \
--enable-diag \
--with-examples=nrf52840 \
--with-platform-info=NRF52840 \
--enable-linker-map \
MBEDTLS_CPPFLAGS="$(NRF52840_MBEDTLS_CPPFLAGS)" \
$(NULL)
examples/Makefile-posix
-1
View File
@@ -94,7 +94,6 @@ configure_OPTIONS = \
--enable-ncp-app=all \
--with-ncp-bus=uart \
--with-examples=posix \
--with-platform-info=POSIX \
--enable-application-coap \
--enable-border-router \
--enable-cert-log \
examples/platforms/cc2538/openthread-core-cc2538-config.h
+26 -18
View File
@@ -34,6 +34,14 @@
#ifndef OPENTHREAD_CORE_CC2538_CONFIG_H_
#define OPENTHREAD_CORE_CC2538_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "CC2538"
/**
* @def OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT
*
@@ -42,28 +50,28 @@
*/
#define OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT 1
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT
*
* Define to 1 if you want to enable software ACK timeout logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT
*
* Define to 1 if you want to enable software ACK timeout logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 1
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT
*
* Define to 1 if you want to enable software retransmission logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT
*
* Define to 1 if you want to enable software retransmission logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 1
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
*
* Define to 1 if you want to enable software energy scanning logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
*
* Define to 1 if you want to enable software energy scanning logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN 1
/**
examples/platforms/cc2650/openthread-core-cc2650-config.h
+8
View File
@@ -29,6 +29,14 @@
#ifndef OPENTHREAD_CORE_CC2650_CONFIG_H_
#define OPENTHREAD_CORE_CC2650_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "CC2650"
/**
* @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS
*
examples/platforms/cc2652/openthread-core-cc2652-config.h
+8
View File
@@ -29,6 +29,14 @@
#ifndef OPENTHREAD_CORE_CC2652_CONFIG_H_
#define OPENTHREAD_CORE_CC2652_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "CC2652"
/**
* @def SETTINGS_CONFIG_BASE_ADDRESS
*
examples/platforms/da15000/openthread-core-da15000-config.h
+32 -19
View File
@@ -34,7 +34,20 @@
#ifndef OPENTHREAD_CORE_DA15000_CONFIG_H_
#define OPENTHREAD_CORE_DA15000_CONFIG_H_
#define SETTINGS_CONFIG_BASE_ADDRESS (0x7B000)
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "DA15000"
/**
* @def SETTINGS_CONFIG_BASE_ADDRESS
*
* The base address of the pages to be used for non-volatile-settings storage.
*/
#define SETTINGS_CONFIG_BASE_ADDRESS (0x7B000)
/**
* @def OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT
@@ -44,28 +57,28 @@
*/
#define OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT 1
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT
*
* Define to 1 if you want to enable software ACK timeout logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT
*
* Define to 1 if you want to enable software ACK timeout logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 0
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT
*
* Define to 1 if you want to enable software retransmission logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT
*
* Define to 1 if you want to enable software retransmission logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 0
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
*
* Define to 1 if you want to enable software energy scanning logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
*
* Define to 1 if you want to enable software energy scanning logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN 1
#endif // OPENTHREAD_CORE_DA15000_CONFIG_H_
examples/platforms/efr32/openthread-core-efr32-config.h
+8
View File
@@ -35,6 +35,14 @@
#ifndef OPENTHREAD_CORE_EFR32_CONFIG_H_
#define OPENTHREAD_CORE_EFR32_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "EFR32"
/**
* @def OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT
*
examples/platforms/emsk/openthread-core-emsk-config.h
+26 -18
View File
@@ -34,6 +34,14 @@
#ifndef OPENTHREAD_CORE_EMSK_CONFIG_H_
#define OPENTHREAD_CORE_EMSK_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "EMSK"
/**
* @def OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT
*
@@ -42,28 +50,28 @@
*/
#define OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT 1
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT
*
* Define to 1 if you want to enable software ACK timeout logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT
*
* Define to 1 if you want to enable software ACK timeout logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 0
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT
*
* Define to 1 if you want to enable software retransmission logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT
*
* Define to 1 if you want to enable software retransmission logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 0
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
*
* Define to 1 if you want to enable software energy scanning logic.
*
*/
/**
* @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
*
* Define to 1 if you want to enable software energy scanning logic.
*
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN 0
#endif // OPENTHREAD_CORE_EMSK_CONFIG_H_
examples/platforms/gp712/openthread-core-gp712-config.h
+8
View File
@@ -34,4 +34,12 @@
#ifndef OPENTHREAD_CORE_GP712_CONFIG_H_
#define OPENTHREAD_CORE_GP712_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "GP712"
#endif // OPENTHREAD_CORE_GP712_CONFIG_H_
examples/platforms/kw41z/openthread-core-kw41z-config.h
+8
View File
@@ -35,6 +35,14 @@
#ifndef OPENTHREAD_CORE_KW41Z_CONFIG_H_
#define OPENTHREAD_CORE_KW41Z_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "KW41Z"
/**
* @def OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT
*
examples/platforms/nrf52840/openthread-core-nrf52840-config.h
+8
View File
@@ -35,6 +35,14 @@
#ifndef OPENTHREAD_CORE_NRF52840_CONFIG_H_
#define OPENTHREAD_CORE_NRF52840_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "NRF52840"
/**
* @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS
*
examples/platforms/posix/openthread-core-posix-config.h
+8
View File
@@ -35,6 +35,14 @@
#ifndef OPENTHREAD_CORE_POSIX_CONFIG_H_
#define OPENTHREAD_CORE_POSIX_CONFIG_H_
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX"
/**
* @def OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT
*
include/openthread-windows-config.h
+3 -3
View File
@@ -76,6 +76,9 @@
#define OPENTHREAD_ENABLE_RAW_LINK_API 1
#endif
/* Define to the platform name. */
#define OPENTHREAD_CONFIG_PLATFORM_INFO "Windows"
/* Define to 1 to enable Border Router feature. */
#define OPENTHREAD_ENABLE_BORDER_ROUTER 1
@@ -103,9 +106,6 @@
/* Version number of package */
#define VERSION "0.01.00"
/* Platform version information */
#define PLATFORM_INFO "Windows"
// Windows Kernel only has sprintf_s
#ifdef _KERNEL_MODE
#define snprintf sprintf_s
src/cli/cli.cpp
+1 -1
View File
@@ -2800,7 +2800,7 @@ void Interpreter::ProcessJoiner(int argc, char *argv[])
VerifyOrExit(argc > 1, error = OT_ERROR_PARSE);
provisioningUrl = (argc > 2) ? argv[2] : NULL;
otJoinerStart(mInstance, argv[1], provisioningUrl,
PACKAGE_NAME, PLATFORM_INFO, PACKAGE_VERSION, NULL,
PACKAGE_NAME, OPENTHREAD_CONFIG_PLATFORM_INFO, PACKAGE_VERSION, NULL,
&Interpreter::s_HandleJoinerCallback, this);
}
else if (strcmp(argv[0], "stop") == 0)
src/core/api/thread_api.cpp
+1 -4
View File
@@ -382,10 +382,7 @@ const char *otGetVersionString(void)
static
#endif
const char sVersion[] =
PACKAGE_NAME "/" PACKAGE_VERSION
#ifdef PLATFORM_INFO
"; " PLATFORM_INFO
#endif
PACKAGE_NAME "/" PACKAGE_VERSION "; " OPENTHREAD_CONFIG_PLATFORM_INFO
#if defined(__DATE__)
"; " __DATE__ " " __TIME__
#endif
src/core/openthread-core-default-config.h
+10
View File
@@ -75,6 +75,16 @@
#define OPENTHREAD_CONFIG_STACK_VERSION_MINOR 1
#endif // OPENTHREAD_CONFIG_STACK_VERSION_MINOR
/**
* @def OPENTHREAD_CONFIG_PLATFORM_INFO
*
* The platform-specific string to insert into the OpenThread version string.
*
*/
#ifndef OPENTHREAD_CONFIG_PLATFORM_INFO
#define OPENTHREAD_CONFIG_PLATFORM_INFO "NONE"
#endif // OPENTHREAD_CONFIG_PLATFORM_INFO
/**
* @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS
*