From 5e34b5062df5f5ee410278698ee4f219e4c1bcc8 Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Sun, 16 Aug 2020 23:48:21 -0400 Subject: [PATCH] [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. --- examples/platforms/efr32mg1/flash.c | 2 +- examples/platforms/efr32mg1/radio.c | 4 +++- examples/platforms/efr32mg1/system.c | 4 +++- examples/platforms/efr32mg12/flash.c | 2 +- examples/platforms/efr32mg12/radio.c | 4 +++- examples/platforms/efr32mg12/system.c | 4 +++- examples/platforms/efr32mg13/flash.c | 2 +- examples/platforms/efr32mg13/radio.c | 4 +++- examples/platforms/efr32mg13/system.c | 3 +++ examples/platforms/efr32mg21/flash.c | 2 +- examples/platforms/efr32mg21/radio.c | 5 +++-- examples/platforms/efr32mg21/system.c | 4 +++- 12 files changed, 28 insertions(+), 12 deletions(-) diff --git a/examples/platforms/efr32mg1/flash.c b/examples/platforms/efr32mg1/flash.c index 15d46ea1a..4f3596974 100644 --- a/examples/platforms/efr32mg1/flash.c +++ b/examples/platforms/efr32mg1/flash.c @@ -31,7 +31,7 @@ * This file implements the OpenThread platform abstraction for the non-volatile storage. */ -#include "openthread-core-efr32-config.h" +#include #include #if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system diff --git a/examples/platforms/efr32mg1/radio.c b/examples/platforms/efr32mg1/radio.c index 764be7183..ad2ce7991 100644 --- a/examples/platforms/efr32mg1/radio.c +++ b/examples/platforms/efr32mg1/radio.c @@ -32,6 +32,9 @@ * */ +#include +#include + #include #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" diff --git a/examples/platforms/efr32mg1/system.c b/examples/platforms/efr32mg1/system.c index 7b1aa3c25..2b5087bb6 100644 --- a/examples/platforms/efr32mg1/system.c +++ b/examples/platforms/efr32mg1/system.c @@ -32,6 +32,9 @@ * This file includes the platform-specific initializers. */ +#include +#include + #include #include @@ -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) diff --git a/examples/platforms/efr32mg12/flash.c b/examples/platforms/efr32mg12/flash.c index 15d46ea1a..4f3596974 100644 --- a/examples/platforms/efr32mg12/flash.c +++ b/examples/platforms/efr32mg12/flash.c @@ -31,7 +31,7 @@ * This file implements the OpenThread platform abstraction for the non-volatile storage. */ -#include "openthread-core-efr32-config.h" +#include #include #if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system diff --git a/examples/platforms/efr32mg12/radio.c b/examples/platforms/efr32mg12/radio.c index 764be7183..ad2ce7991 100644 --- a/examples/platforms/efr32mg12/radio.c +++ b/examples/platforms/efr32mg12/radio.c @@ -32,6 +32,9 @@ * */ +#include +#include + #include #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" diff --git a/examples/platforms/efr32mg12/system.c b/examples/platforms/efr32mg12/system.c index 7b1aa3c25..2b5087bb6 100644 --- a/examples/platforms/efr32mg12/system.c +++ b/examples/platforms/efr32mg12/system.c @@ -32,6 +32,9 @@ * This file includes the platform-specific initializers. */ +#include +#include + #include #include @@ -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) diff --git a/examples/platforms/efr32mg13/flash.c b/examples/platforms/efr32mg13/flash.c index 15d46ea1a..4f3596974 100644 --- a/examples/platforms/efr32mg13/flash.c +++ b/examples/platforms/efr32mg13/flash.c @@ -31,7 +31,7 @@ * This file implements the OpenThread platform abstraction for the non-volatile storage. */ -#include "openthread-core-efr32-config.h" +#include #include #if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system diff --git a/examples/platforms/efr32mg13/radio.c b/examples/platforms/efr32mg13/radio.c index 2f8bcdc30..e104d810c 100644 --- a/examples/platforms/efr32mg13/radio.c +++ b/examples/platforms/efr32mg13/radio.c @@ -32,6 +32,9 @@ * */ +#include +#include + #include #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" diff --git a/examples/platforms/efr32mg13/system.c b/examples/platforms/efr32mg13/system.c index 7b1aa3c25..815e29cc2 100644 --- a/examples/platforms/efr32mg13/system.c +++ b/examples/platforms/efr32mg13/system.c @@ -32,6 +32,9 @@ * This file includes the platform-specific initializers. */ +#include +#include + #include #include diff --git a/examples/platforms/efr32mg21/flash.c b/examples/platforms/efr32mg21/flash.c index 15d46ea1a..4f3596974 100644 --- a/examples/platforms/efr32mg21/flash.c +++ b/examples/platforms/efr32mg21/flash.c @@ -31,7 +31,7 @@ * This file implements the OpenThread platform abstraction for the non-volatile storage. */ -#include "openthread-core-efr32-config.h" +#include #include #if OPENTHREAD_CONFIG_PLATFORM_FLASH_API_ENABLE // Use OT NV system diff --git a/examples/platforms/efr32mg21/radio.c b/examples/platforms/efr32mg21/radio.c index 60e4dbe47..9bdd4719e 100644 --- a/examples/platforms/efr32mg21/radio.c +++ b/examples/platforms/efr32mg21/radio.c @@ -32,10 +32,12 @@ * */ +#include +#include + #include #include "openthread-system.h" -#include #include #include #include @@ -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" diff --git a/examples/platforms/efr32mg21/system.c b/examples/platforms/efr32mg21/system.c index 58bf86a56..32f934674 100644 --- a/examples/platforms/efr32mg21/system.c +++ b/examples/platforms/efr32mg21/system.c @@ -32,6 +32,9 @@ * This file includes the platform-specific initializers. */ +#include +#include + #include #include @@ -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)