michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: nrf5: Don't force specific drivers from soc/arm/nordic_nrf

Browse source 
Redefining the config will not let another (out-of-source) driver be
chosen instead of the default. The driver is practically forced by the
soc settings. This commit moves default settings from soc/arm/nordic_nrf
into the drivers themselves.

Signed-off-by: Thomas Stenersen <thomas.stenersen@nordicsemi.no>
This commit is contained in:
Thomas Stenersen 2019-02-21 15:53:29 +01:00 • committed by Carles Cufí
commit a3fc1a1f53
9 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/posix/nrf52_bsim/Kconfig.board
View file

@ -9,7 +9,6 @@ config BOARD_NRF52_BSIM
select CONSOLE_HAS_DRIVER select CONSOLE_HAS_DRIVER
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
help help
Will produce a console Linux process which can be executed natively. Will produce a console Linux process which can be executed natively.
It needs the BabbleSim simulator both in compile time and to execute It needs the BabbleSim simulator both in compile time and to execute

1
drivers/clock_control/Kconfig.nrf
View file

@ -7,6 +7,7 @@
menuconfig CLOCK_CONTROL_NRF menuconfig CLOCK_CONTROL_NRF
bool "NRF Clock controller support" bool "NRF Clock controller support"
depends on SOC_COMPATIBLE_NRF depends on SOC_COMPATIBLE_NRF
default y
help help
Enable support for the Nordic Semiconductor nRFxx series SoC clock Enable support for the Nordic Semiconductor nRFxx series SoC clock
driver. driver.

2
drivers/entropy/Kconfig.nrf5
View file

@ -9,6 +9,7 @@ menuconfig ENTROPY_NRF5_RNG
bool "nRF5 RNG driver" bool "nRF5 RNG driver"
depends on SOC_COMPATIBLE_NRF depends on SOC_COMPATIBLE_NRF
select ENTROPY_HAS_DRIVER select ENTROPY_HAS_DRIVER
default y
help help
This option enables the RNG peripheral, which is a random number This option enables the RNG peripheral, which is a random number
generator, based on internal thermal noise, that provides a generator, based on internal thermal noise, that provides a
@ -59,7 +60,6 @@ config ENTROPY_NRF5_ISR_THRESHOLD
buffer goes below this number hardware entropy generation will be buffer goes below this number hardware entropy generation will be
started. started.
config ENTROPY_NRF5_PRI config ENTROPY_NRF5_PRI
int "RNG interrupt priority" int "RNG interrupt priority"
range 0 2 if SOC_SERIES_NRF51X range 0 2 if SOC_SERIES_NRF51X

1
drivers/flash/Kconfig.nrf
View file

@ -3,6 +3,7 @@ config SOC_FLASH_NRF
depends on SOC_FAMILY_NRF depends on SOC_FAMILY_NRF
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED select FLASH_HAS_DRIVER_ENABLED
default y
help help
Enables Nordic Semiconductor nRF flash driver. Enables Nordic Semiconductor nRF flash driver.

3
drivers/timer/Kconfig
View file

@ -111,7 +111,8 @@ config ALTERA_AVALON_TIMER
config NRF_RTC_TIMER config NRF_RTC_TIMER
bool "nRF Real Time Counter (NRF_RTC1) Timer" bool "nRF Real Time Counter (NRF_RTC1) Timer"
default y default y
depends on CLOCK_CONTROL_NRF depends on CLOCK_CONTROL
depends on SOC_COMPATIBLE_NRF
select TICKLESS_CAPABLE select TICKLESS_CAPABLE
help help
This module implements a kernel device driver for the nRF Real Time This module implements a kernel device driver for the nRF Real Time

14
soc/arm/nordic_nrf/Kconfig.defconfig
View file

@ -12,20 +12,6 @@ source "soc/arm/nordic_nrf/*/Kconfig.defconfig.series"
config BUILD_OUTPUT_HEX config BUILD_OUTPUT_HEX
default y default y
if FLASH
config SOC_FLASH_NRF
default y
endif # FLASH
if ENTROPY_GENERATOR
config ENTROPY_NRF5_RNG
default y
endif # ENTROPY_GENERATOR
if SPI if SPI
config GPIO config GPIO

1
soc/arm/nordic_nrf/nrf51/Kconfig.series
View file

@ -12,7 +12,6 @@ config SOC_SERIES_NRF51X
select SOC_FAMILY_NRF select SOC_FAMILY_NRF
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
select HAS_STATE_DEEP_SLEEP_1 select HAS_STATE_DEEP_SLEEP_1
select XIP select XIP
select HAS_CMSIS select HAS_CMSIS

1
soc/arm/nordic_nrf/nrf52/Kconfig.series
View file

@ -13,7 +13,6 @@ config SOC_SERIES_NRF52X
select SOC_FAMILY_NRF select SOC_FAMILY_NRF
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
select HAS_STATE_DEEP_SLEEP_1 select HAS_STATE_DEEP_SLEEP_1
select XIP select XIP
select HAS_CMSIS select HAS_CMSIS

1
soc/arm/nordic_nrf/nrf91/Kconfig.series
View file

@ -15,7 +15,6 @@ config SOC_SERIES_NRF91X
select SOC_FAMILY_NRF select SOC_FAMILY_NRF
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF
select HAS_STATE_DEEP_SLEEP_1 select HAS_STATE_DEEP_SLEEP_1
select XIP select XIP
select HAS_CMSIS select HAS_CMSIS