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

Thomas Stenersen · Thomas Stenersen · commit 2478ce5790c1 · 2019-03-11T12:37:42.000+01:00
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 &lt;thomas.stenersen@nordicsemi.no&gt;
diff --git a/boards/posix/nrf52_bsim/Kconfig.board b/boards/posix/nrf52_bsim/Kconfig.board
@@ -9,7 +9,6 @@ config BOARD_NRF52_BSIM
 	select CONSOLE_HAS_DRIVER
 	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
-	select CLOCK_CONTROL_NRF
 	help
 	  Will produce a console Linux process which can be executed natively.
 	  It needs the BabbleSim simulator both in compile time and to execute
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
@@ -7,6 +7,7 @@
 menuconfig CLOCK_CONTROL_NRF
 	bool "NRF Clock controller support"
 	depends on SOC_COMPATIBLE_NRF
+	default y
 	help
 	  Enable support for the Nordic Semiconductor nRFxx series SoC clock
 	  driver.
diff --git a/drivers/entropy/Kconfig.nrf5 b/drivers/entropy/Kconfig.nrf5
@@ -9,6 +9,7 @@ menuconfig ENTROPY_NRF5_RNG
 	bool "nRF5 RNG driver"
 	depends on SOC_COMPATIBLE_NRF
 	select ENTROPY_HAS_DRIVER
+	default y
 	help
 	  This option enables the RNG peripheral, which is a random number
 	  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
 	  started.
 
-
 config ENTROPY_NRF5_PRI
 	int "RNG interrupt priority"
 	range 0 2 if SOC_SERIES_NRF51X
diff --git a/drivers/flash/Kconfig.nrf b/drivers/flash/Kconfig.nrf
@@ -3,6 +3,7 @@ config SOC_FLASH_NRF
 	depends on SOC_FAMILY_NRF
 	select FLASH_HAS_PAGE_LAYOUT
 	select FLASH_HAS_DRIVER_ENABLED
+	default y
 	help
 	  Enables Nordic Semiconductor nRF flash driver.
 
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
@@ -111,7 +111,8 @@ config ALTERA_AVALON_TIMER
 config NRF_RTC_TIMER
 	bool "nRF Real Time Counter (NRF_RTC1) Timer"
 	default y
-	depends on CLOCK_CONTROL_NRF
+	depends on CLOCK_CONTROL
+	depends on SOC_COMPATIBLE_NRF
 	select TICKLESS_CAPABLE
 	help
 	  This module implements a kernel device driver for the nRF Real Time
diff --git a/soc/arm/nordic_nrf/Kconfig.defconfig b/soc/arm/nordic_nrf/Kconfig.defconfig
@@ -12,20 +12,6 @@ source "soc/arm/nordic_nrf/*/Kconfig.defconfig.series"
 config BUILD_OUTPUT_HEX
 	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
 
 config GPIO
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.series
@@ -12,7 +12,6 @@ config  SOC_SERIES_NRF51X
 	select SOC_FAMILY_NRF
 	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
-	select CLOCK_CONTROL_NRF
 	select HAS_STATE_DEEP_SLEEP_1
 	select XIP
 	select HAS_CMSIS
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.series
@@ -13,7 +13,6 @@ config  SOC_SERIES_NRF52X
 	select SOC_FAMILY_NRF
 	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
-	select CLOCK_CONTROL_NRF
 	select HAS_STATE_DEEP_SLEEP_1
 	select XIP
 	select HAS_CMSIS
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.series
@@ -15,7 +15,6 @@ config  SOC_SERIES_NRF91X
 	select SOC_FAMILY_NRF
 	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
-	select CLOCK_CONTROL_NRF
 	select HAS_STATE_DEEP_SLEEP_1
 	select XIP
 	select HAS_CMSIS
