From 65d6c980373a2389a41150bdbaf43b66393d0499 Mon Sep 17 00:00:00 2001 From: Piotr Szkotak Date: Fri, 18 May 2018 00:22:57 +0200 Subject: [PATCH] [nrf52840] fix building with FULL_LOGS=1 and update .travis/script.sh (#2720) Signed-off-by: Piotr Szkotak --- .travis/script.sh | 12 ++++++++---- .../nrf52840/openthread-core-nrf52840-config.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis/script.sh b/.travis/script.sh index c816b0834..254c46ec8 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -100,11 +100,12 @@ set -x git checkout -- . || die git clean -xfd || die ./bootstrap || die - COMMISSIONER=1 JOINER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 make -f examples/Makefile-nrf52840 || die + BORDER_ROUTER=1 COAP=1 COMMISSIONER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 FULL_LOGS=1 JOINER=1 MAC_FILTER=1 MTD_NETDIAG=1 SERVICE=1 TMF_PROXY=1 make -f examples/Makefile-nrf52840 || die arm-none-eabi-size output/nrf52840/bin/ot-cli-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-cli-mtd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-mtd || die + arm-none-eabi-size output/nrf52840/bin/ot-ncp-radio || die git checkout -- . || die git clean -xfd || die @@ -168,11 +169,12 @@ set -x git checkout -- . || die git clean -xfd || die ./bootstrap || die - COMMISSIONER=1 JOINER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 make -f examples/Makefile-nrf52840 || die + BORDER_ROUTER=1 COAP=1 COMMISSIONER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 FULL_LOGS=1 JOINER=1 MAC_FILTER=1 MTD_NETDIAG=1 SERVICE=1 TMF_PROXY=1 make -f examples/Makefile-nrf52840 || die arm-none-eabi-size output/nrf52840/bin/ot-cli-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-cli-mtd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-mtd || die + arm-none-eabi-size output/nrf52840/bin/ot-ncp-radio || die git checkout -- . || die git clean -xfd || die @@ -236,11 +238,12 @@ set -x git checkout -- . || die git clean -xfd || die ./bootstrap || die - COMMISSIONER=1 JOINER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 make -f examples/Makefile-nrf52840 || die + BORDER_ROUTER=1 COAP=1 COMMISSIONER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 FULL_LOGS=1 JOINER=1 MAC_FILTER=1 MTD_NETDIAG=1 SERVICE=1 TMF_PROXY=1 make -f examples/Makefile-nrf52840 || die arm-none-eabi-size output/nrf52840/bin/ot-cli-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-cli-mtd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-mtd || die + arm-none-eabi-size output/nrf52840/bin/ot-ncp-radio || die git checkout -- . || die git clean -xfd || die @@ -315,11 +318,12 @@ set -x git checkout -- . || die git clean -xfd || die ./bootstrap || die - COMMISSIONER=1 JOINER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 make -f examples/Makefile-nrf52840 || die + BORDER_ROUTER=1 COAP=1 COMMISSIONER=1 DHCP6_CLIENT=1 DHCP6_SERVER=1 DNS_CLIENT=1 FULL_LOGS=1 JOINER=1 MAC_FILTER=1 MTD_NETDIAG=1 SERVICE=1 TMF_PROXY=1 make -f examples/Makefile-nrf52840 || die arm-none-eabi-size output/nrf52840/bin/ot-cli-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-cli-mtd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-ftd || die arm-none-eabi-size output/nrf52840/bin/ot-ncp-mtd || die + arm-none-eabi-size output/nrf52840/bin/ot-ncp-radio || die git checkout -- . || die git clean -xfd || die diff --git a/examples/platforms/nrf52840/openthread-core-nrf52840-config.h b/examples/platforms/nrf52840/openthread-core-nrf52840-config.h index f53caa5ca..1aeda9fe9 100644 --- a/examples/platforms/nrf52840/openthread-core-nrf52840-config.h +++ b/examples/platforms/nrf52840/openthread-core-nrf52840-config.h @@ -90,7 +90,9 @@ * Define to prepend the log level to all log messages * */ +#ifndef OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL #define OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL 0 +#endif /** * @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT