From 7abc3310476418eac41cc1296928bcfe9e7178d3 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Wed, 18 Oct 2017 18:17:53 +0200 Subject: [PATCH] cc2538 platforms: do not set Main log level from contiki-conf --- arch/platform/cc2538dk/contiki-conf.h | 13 ------------- arch/platform/openmote-cc2538/contiki-conf.h | 14 +------------- arch/platform/zoul/contiki-conf.h | 13 ------------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/arch/platform/cc2538dk/contiki-conf.h b/arch/platform/cc2538dk/contiki-conf.h index 2e857fdba..034ad4198 100644 --- a/arch/platform/cc2538dk/contiki-conf.h +++ b/arch/platform/cc2538dk/contiki-conf.h @@ -118,17 +118,7 @@ typedef uint32_t rtimer_clock_t; #endif /** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name Generic Configuration directives - * - * @{ - */ -#ifndef LOG_CONF_LEVEL_MAIN -#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE /**< Set to 0 to decrease startup verbosity */ -#endif -/** @} */ /*---------------------------------------------------------------------------*/ /** * \name uDMA Configuration and channel allocations @@ -220,9 +210,6 @@ typedef uint32_t rtimer_clock_t; #undef UART_CONF_ENABLE #define UART_CONF_ENABLE 0 - -#undef LOG_CONF_LEVEL_MAIN -#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE #endif /* CC2538_CONF_QUIET */ /** diff --git a/arch/platform/openmote-cc2538/contiki-conf.h b/arch/platform/openmote-cc2538/contiki-conf.h index 9d87a85e5..4e56dacff 100644 --- a/arch/platform/openmote-cc2538/contiki-conf.h +++ b/arch/platform/openmote-cc2538/contiki-conf.h @@ -167,16 +167,7 @@ typedef uint32_t rtimer_clock_t; #endif /** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name Generic Configuration directives - * - * @{ - */ -#ifndef LOG_CONF_LEVEL_MAIN -#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE /**< Set to 0 to decrease startup verbosity */ -#endif -/** @} */ + /*---------------------------------------------------------------------------*/ /** * \name uDMA Configuration and channel allocations @@ -268,9 +259,6 @@ typedef uint32_t rtimer_clock_t; #undef UART_CONF_ENABLE #define UART_CONF_ENABLE 0 - -#undef LOG_CONF_LEVEL_MAIN -#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE #endif /* CC2538_CONF_QUIET */ /** diff --git a/arch/platform/zoul/contiki-conf.h b/arch/platform/zoul/contiki-conf.h index 5f9586049..bb98ddd10 100644 --- a/arch/platform/zoul/contiki-conf.h +++ b/arch/platform/zoul/contiki-conf.h @@ -163,16 +163,6 @@ typedef uint32_t rtimer_clock_t; #ifndef USB_ARCH_CONF_DMA #define USB_ARCH_CONF_DMA 1 /**< Change to Enable/Disable USB DMA */ -#endif -/** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name Generic Configuration directives - * - * @{ - */ -#ifndef LOG_CONF_LEVEL_MAIN -#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE /**< Set to 0 to decrease startup verbosity */ #endif /** @} */ /*---------------------------------------------------------------------------*/ @@ -266,9 +256,6 @@ typedef uint32_t rtimer_clock_t; #undef UART_CONF_ENABLE #define UART_CONF_ENABLE 0 - -#undef LOG_CONF_LEVEL_MAIN -#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE #endif /* CC2538_CONF_QUIET */ /**