diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig b/boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig index e294ecedbf4..9224147c39f 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig +++ b/boards/arm/nrf9160_pca10090/nrf9160_pca10090_defconfig @@ -25,6 +25,3 @@ CONFIG_UART_CONSOLE=y # additional board options CONFIG_GPIO_AS_PINRESET=y - -# entropy driver doesn't support nRF9160 yet -CONFIG_ENTROPY_NRF5_RNG=n diff --git a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig b/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig index 27fc0cbe677..d0c5d82b921 100644 --- a/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig +++ b/boards/arm/nrf9160_pca10090/nrf9160_pca10090ns_defconfig @@ -28,6 +28,3 @@ CONFIG_UART_CONSOLE=y # additional board options CONFIG_GPIO_AS_PINRESET=y - -# entropy driver doesn't support nRF9160 yet -CONFIG_ENTROPY_NRF5_RNG=n diff --git a/boards/posix/nrf52_bsim/Kconfig b/boards/posix/nrf52_bsim/Kconfig index 65618654e50..159327977bf 100644 --- a/boards/posix/nrf52_bsim/Kconfig +++ b/boards/posix/nrf52_bsim/Kconfig @@ -2,6 +2,12 @@ if BOARD_NRF52_BSIM +# The following file is normally parsed only for the ARM architecture, which is +# used by Nordic SoCs, so to make the symbols defined in this file available for +# the simulated nrf52_bsim board, which uses the POSIX architecture, the file +# must be read also from here. +source "soc/arm/nordic_nrf/Kconfig.peripherals" + comment "NRF52_BSIM options" config PRINTK_HOOK_INIT_PRIORITY diff --git a/boards/posix/nrf52_bsim/Kconfig.board b/boards/posix/nrf52_bsim/Kconfig.board index 4c33c7feef6..c29cf83ec90 100644 --- a/boards/posix/nrf52_bsim/Kconfig.board +++ b/boards/posix/nrf52_bsim/Kconfig.board @@ -10,6 +10,10 @@ config BOARD_NRF52_BSIM select CONSOLE_HAS_DRIVER select NRF_RTC_TIMER select CLOCK_CONTROL + # Indicate that the nRF RNG peripheral is present (actually a model + # of it), so that the corresponding driver becomes available (see + # dependencies of the ENTROPY_NRF5_RNG option). + select HAS_HW_NRF_RNG 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/entropy/Kconfig.nrf5 b/drivers/entropy/Kconfig.nrf5 index 8d9aefee6ff..b64e03f5a41 100644 --- a/drivers/entropy/Kconfig.nrf5 +++ b/drivers/entropy/Kconfig.nrf5 @@ -16,7 +16,7 @@ if !ENTROPY_NRF_FORCE_ALT menuconfig ENTROPY_NRF5_RNG bool "nRF5 RNG driver" - depends on SOC_COMPATIBLE_NRF + depends on HAS_HW_NRF_RNG select ENTROPY_HAS_DRIVER default y help