Merge pull request #9074 from haukepetersen/opt_nrf5x_nrfminfeature

cpu/nrf5x: define nrfmin feature in nrf5x_common
This commit is contained in:
Kaspar Schleiser 2018-05-12 02:18:31 +02:00 committed by GitHub
commit bb60b3e040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 4 additions and 69 deletions

View File

@ -8,7 +8,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_2 FEATURES_MCU_GROUP = cortex_m0_2

View File

@ -124,16 +124,6 @@ static const i2c_conf_t i2c_config[] = {
#define ADC_NUMOF (4) #define ADC_NUMOF (4)
/** @} */ /** @} */
/**
* @name Radio device configuration
*
* The radio is not guarded by a NUMOF define, as the radio is selected by its
* own module in the build system.
* @{
*/
#define RADIO_IRQ_PRIO 1
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} /* end extern "C" */ } /* end extern "C" */
#endif #endif

View File

@ -7,7 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_pwm
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1 FEATURES_MCU_GROUP = cortex_m0_1

View File

@ -112,16 +112,6 @@ static const i2c_conf_t i2c_config[] = {
#define ADC_NUMOF (0) #define ADC_NUMOF (0)
/** @} */ /** @} */
/**
* @name Radio device configuration
*
* The radio is not guarded by a NUMOF define, as the radio is selected by its
* own module in the build system.
* @{
*/
#define RADIO_IRQ_PRIO 1
/** @} */
/** /**
* @name PWM configuration * @name PWM configuration
* @{ * @{

View File

@ -9,7 +9,6 @@ FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_ble FEATURES_PROVIDED += radio_ble
FEATURES_PROVIDED += radio_nrfble FEATURES_PROVIDED += radio_nrfble
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3 FEATURES_MCU_GROUP = cortex_m4_3

View File

@ -6,7 +6,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1 FEATURES_MCU_GROUP = cortex_m0_1

View File

@ -118,16 +118,6 @@ static const i2c_conf_t i2c_config[] = {
#define ADC_NUMOF (0) #define ADC_NUMOF (0)
/** @} */ /** @} */
/**
* @name Radio device configuration
*
* The radio is not guarded by a NUMOF define, as the radio is selected by its
* own module in the build system.
* @{
*/
#define RADIO_IRQ_PRIO 1
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -5,7 +5,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1 FEATURES_MCU_GROUP = cortex_m0_1

View File

@ -86,16 +86,6 @@ static const timer_conf_t timer_config[] = {
#define ADC_NUMOF (0) #define ADC_NUMOF (0)
/** @} */ /** @} */
/**
* @name Radio device configuration
*
* The radio is not guarded by a NUMOF define, as the radio is selected by its
* own module in the build system.
* @{
*/
#define RADIO_IRQ_PRIO 1
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -6,7 +6,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_2 FEATURES_MCU_GROUP = cortex_m0_2

View File

@ -83,16 +83,6 @@ static const timer_conf_t timer_config[] = {
#define UART_PIN_CTS 18 #define UART_PIN_CTS 18
/** @} */ /** @} */
/**
* @name Radio device configuration
*
* The radio is not guarded by a NUMOF define, as the radio is selected by its
* own module in the build system.
* @{
*/
#define RADIO_IRQ_PRIO 1
/** @} */
/** /**
* @name SPI configuration * @name SPI configuration
* @{ * @{

View File

@ -6,7 +6,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3 FEATURES_MCU_GROUP = cortex_m4_3

View File

@ -5,7 +5,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3 FEATURES_MCU_GROUP = cortex_m4_3

View File

@ -8,7 +8,6 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_2 FEATURES_MCU_GROUP = cortex_m0_2

View File

@ -122,16 +122,6 @@ static const i2c_conf_t i2c_config[] = {
#define ADC_NUMOF (4) #define ADC_NUMOF (4)
/** @} */ /** @} */
/**
* @name Radio device configuration
*
* The radio is not guarded by a NUMOF define, as the radio is selected by its
* own module in the build system.
* @{
*/
#define RADIO_IRQ_PRIO 1
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -1,5 +1,9 @@
# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_flashpage FEATURES_PROVIDED += periph_flashpage
FEATURES_PROVIDED += periph_hwrng FEATURES_PROVIDED += periph_hwrng
# Various other features (if any)
FEATURES_PROVIDED += radio_nrfmin
-include $(RIOTCPU)/cortexm_common/Makefile.features -include $(RIOTCPU)/cortexm_common/Makefile.features