[efr32] switch to proper config #include style (#5409)

Use the config specified on the command line, so that overriding this
with a project specific config doesn't cause preprocessor macro
redefinition errors.
This commit is contained in:
Michael Spang
2020-08-16 20:48:21 -07:00
committed by GitHub
parent 9c8f0951df
commit 5e34b5062d
12 changed files with 28 additions and 12 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
* This file implements the OpenThread platform abstraction for the non-volatile storage.
*/
#include "openthread-core-efr32-config.h"
#include <openthread-core-config.h>
#include <openthread/config.h>
#if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system
+3 -1
View File
@@ -32,6 +32,9 @@
*
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include "openthread-system.h"
@@ -50,7 +53,6 @@
#include "em_core.h"
#include "em_system.h"
#include "hal-config.h"
#include "openthread-core-efr32-config.h"
#include "pa_conversions_efr32.h"
#include "platform-band.h"
#include "rail.h"
+3 -1
View File
@@ -32,6 +32,9 @@
* This file includes the platform-specific initializers.
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include <string.h>
@@ -52,7 +55,6 @@
#include "sl_mpu.h"
#include "sl_sleeptimer.h"
#include "openthread-core-efr32-config.h"
#include "platform-efr32.h"
#if (HAL_FEM_ENABLE)
+1 -1
View File
@@ -31,7 +31,7 @@
* This file implements the OpenThread platform abstraction for the non-volatile storage.
*/
#include "openthread-core-efr32-config.h"
#include <openthread-core-config.h>
#include <openthread/config.h>
#if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system
+3 -1
View File
@@ -32,6 +32,9 @@
*
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include "openthread-system.h"
@@ -50,7 +53,6 @@
#include "em_core.h"
#include "em_system.h"
#include "hal-config.h"
#include "openthread-core-efr32-config.h"
#include "pa_conversions_efr32.h"
#include "platform-band.h"
#include "rail.h"
+3 -1
View File
@@ -32,6 +32,9 @@
* This file includes the platform-specific initializers.
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include <string.h>
@@ -52,7 +55,6 @@
#include "sl_mpu.h"
#include "sl_sleeptimer.h"
#include "openthread-core-efr32-config.h"
#include "platform-efr32.h"
#if (HAL_FEM_ENABLE)
+1 -1
View File
@@ -31,7 +31,7 @@
* This file implements the OpenThread platform abstraction for the non-volatile storage.
*/
#include "openthread-core-efr32-config.h"
#include <openthread-core-config.h>
#include <openthread/config.h>
#if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system
+3 -1
View File
@@ -32,6 +32,9 @@
*
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include "openthread-system.h"
@@ -50,7 +53,6 @@
#include "em_core.h"
#include "em_system.h"
#include "hal-config.h"
#include "openthread-core-efr32-config.h"
#include "pa_conversions_efr32.h"
#include "platform-band.h"
#include "rail.h"
+3
View File
@@ -32,6 +32,9 @@
* This file includes the platform-specific initializers.
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include <string.h>
+1 -1
View File
@@ -31,7 +31,7 @@
* This file implements the OpenThread platform abstraction for the non-volatile storage.
*/
#include "openthread-core-efr32-config.h"
#include <openthread-core-config.h>
#include <openthread/config.h>
#if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system
+3 -2
View File
@@ -32,10 +32,12 @@
*
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include "openthread-system.h"
#include <openthread/config.h>
#include <openthread/platform/alarm-milli.h>
#include <openthread/platform/diag.h>
#include <openthread/platform/radio.h>
@@ -49,7 +51,6 @@
#include "em_cmu.h"
#include "em_core.h"
#include "em_system.h"
#include "openthread-core-efr32-config.h"
#include "pa_conversions_efr32.h"
#include "platform-band.h"
#include "rail.h"
+3 -1
View File
@@ -32,6 +32,9 @@
* This file includes the platform-specific initializers.
*/
#include <openthread-core-config.h>
#include <openthread/config.h>
#include <assert.h>
#include <string.h>
@@ -52,7 +55,6 @@
#include "sl_mpu.h"
#include "sl_sleeptimer.h"
#include "openthread-core-efr32-config.h"
#include "platform-efr32.h"
#if (HAL_FEM_ENABLE)