nrf_security: improve CONFIG_PSA_WANT_GENERATE_RANDOM

- Make it default y if ENTROPY_PSA_CRYPTO_RNG instead of redefining
that Kconfig option to select it.

- Select it only when NRF_SECURITY is enabled.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

Author: tomi-font

subsys/nrf_security/Kconfig.psa.nordic

@@ -424,7 +424,7 @@ comment "Nordic addded RNG configuration"
 
 config PSA_WANT_GENERATE_RANDOM
 	bool "PSA RNG support" if !PSA_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
+	default y if PSA_CRYPTO_ENABLE_ALL || ENTROPY_PSA_CRYPTO_RNG
 
 comment "Nordic added key types"
 
@@ -686,6 +686,3 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
-
-config ENTROPY_PSA_CRYPTO_RNG
-	select PSA_WANT_GENERATE_RANDOM

subsys/secure_storage/compatibility/Kconfig

@@ -27,7 +27,7 @@ choice SECURE_STORAGE_ITS_TRANSFORM_IMPLEMENTATION
 config SECURE_STORAGE_ITS_TRANSFORM_IMPLEMENTATION_TSBC
 	bool "ITS transform module implementation compatible with the Trusted storage library"
 	depends on SECURE_STORAGE_TRUSTED_STORAGE_COMPATIBILITY
-	select PSA_WANT_GENERATE_RANDOM
+	select PSA_WANT_GENERATE_RANDOM if NRF_SECURITY
 	select PSA_WANT_KEY_TYPE_CHACHA20
 	select PSA_WANT_ALG_CHACHA20_POLY1305